No need to pass on HTML, plain text is sufficient
Add fallback when mandrill is down
Content attribute confuses with controller content hook
Merge branch 'contact-improvements'