Fixed bug in user mailer view
Merge branch 'release/0.2.11'