Add option to change the default email address in text to email from send text module
Fix conflicts after merging MH-772 to dev