Galaxy S5 issue with attaching pics to a text message

[tvanderp]

When using the default message app I cannot attach a pic to a text message and still edit the text. My steps are, open a message window, pick a recipient, click the paper clip to add an attachment, choose "gallery", choose pic.....then in the upper right hand corner my only option is "send", not "done" so only the pic is sent without any text. If I go the the gallery first, select a pic, choose method for sharing, choose "messages", when I select a recipient there is a "done" in the upper right hand corner. However, when I click "done" it automatically sends without having been able to add text. If I create a text message first and then try to attach a pic, the pic is sent by itself and the text message becomes a draft.
Any help is appreciated.