Merge branch 'hotfix/0.2.25.2'
LILY-490: Show account name in email message if available
Merge branch 'feature/LILY-490-show-provided-name-not-email' into develop
LILY-492: Clean up sender of email
Merge branch 'feature/LILY-492-cleanup-sender-in-email-list' into develop
LILY-486: Stop empty subject in template overwriting subject in compose
Merge branch 'feature/LILY-486-fix-empty-subject-template-overwrite' into develop
Hotfix: Fix add contact form
Finished hotfix 0.2.25.3.
LILY-482: Change default salutation in contact to informal
LILY-477: Show cc/bcc input if there's initial data