Fixing up the message and attachment box for the source
Merge pull request #392 from cwattrus/ui-updates

Fixing up the message and attachment box for the source