Merge branch 'feature/sendmail' into feature/delete-message