Index: app/controllers/mail_handler_controller.rb
===================================================================
--- app/controllers/mail_handler_controller.rb	(revision 17482)
+++ app/controllers/mail_handler_controller.rb	(working copy)
@@ -26,7 +26,7 @@
   def index
     options = params.dup
     email = options.delete(:email)
-    if MailHandler.receive(email, options)
+    if MailHandler.safe_receive(email, options)
       head :created
     else
       head :unprocessable_entity
Index: lib/tasks/email.rake
===================================================================
--- lib/tasks/email.rake	(revision 17482)
+++ lib/tasks/email.rake	(working copy)
@@ -26,7 +26,7 @@
 
     task :read => :environment do
       Mailer.with_synched_deliveries do
-        MailHandler.receive(STDIN.read, MailHandler.extract_options_from_env(ENV))
+        MailHandler.safe_receive(STDIN.read, MailHandler.extract_options_from_env(ENV))
       end
     end