diff --git a/lib/msf/core/exploit/smtp_deliver.rb b/lib/msf/core/exploit/smtp_deliver.rb
index 9ff8693723..ba24485608 100644
--- a/lib/msf/core/exploit/smtp_deliver.rb
+++ b/lib/msf/core/exploit/smtp_deliver.rb
@@ -163,8 +163,8 @@ module Exploit::Remote::SMTPDeliver
       print_error("Server refused our mail")
     else
       full_msg = ''
-      full_msg << date
-      full_msg << subject unless subject.nil?
+      full_msg << date unless data =~ /date: /i
+      full_msg << subject unless subject.nil? || data =~ /subject: /i
       full_msg << data
       send_status = raw_send_recv("#{full_msg}\r\n.\r\n", nsock)
     end
diff --git a/modules/auxiliary/client/smtp/emailer.rb b/modules/auxiliary/client/smtp/emailer.rb
index a5f76cdeb4..d209a87898 100644
--- a/modules/auxiliary/client/smtp/emailer.rb
+++ b/modules/auxiliary/client/smtp/emailer.rb
@@ -119,7 +119,6 @@ class MetasploitModule < Msf::Auxiliary
     datastore['MAILFROM'] = from
 
     msg       = load_file(msg_file)
-    email_sig = load_file(sig_file)
 
     if (type !~ /text/i and type !~ /text\/html/i)
       print_error("YAML config: #{type}")