diff --git a/sensu/files/handlers/mail.json b/sensu/files/handlers/mail.json
index 921ead1..24ad061 100644
--- a/sensu/files/handlers/mail.json
+++ b/sensu/files/handlers/mail.json
@@ -25,7 +25,7 @@
     "encryption": "{{ handler.get('encryption') }}",
     {%- endif %}
     "subject": "Sensu Alert",
-    "from": "sensu@{{ handler.get('domain', 'example.org') }}",
+    "from": "{{ handler.get('mail_from', 'sensu@'+handler.get('domain', 'example.org')) }}",
     "to": "{{ handler.mail_to }}",
     "host": "{{ handler.get('host', 'localhost') }}",
     "port": "{{ handler.get('port', '25') }}"