Edit btn now changes to done when edit menu is open
Minor cosmetic changes to new message
Merge branch 'master' into FH-35-reply-conversation