diff --git a/index.js b/index.js
index ead0495..5522548 100644
--- a/index.js
+++ b/index.js
@@ -206,11 +206,11 @@ exports.processMessage = function(data) {
     function(match, from) {
       var fromText;
       if (data.config.fromEmail) {
-        fromText = 'From: ' + from.replace(/<(.*)>/, '').trim() +
-        ' <' + data.config.fromEmail + '>';
+        fromText = 'From: "' + from.replace(/<(.*)>/, '').trim() +
+        '" <' + data.config.fromEmail + '>';
       } else {
-        fromText = 'From: ' + from.replace('<', 'at ').replace('>', '') +
-        ' <' + data.originalRecipient + '>';
+        fromText = 'From: "' + from.replace('<', 'at ').replace('>', '') +
+        '" <' + data.originalRecipient + '>';
       }
       return fromText;
     });