changing to my own mail composer
Merge branch 'mailComposer'