Make the email body wider
Set the subject for the reset email
Merge branch 'develop'