diff --git a/src/applications/differential/DifferentialReplyHandler.php b/src/applications/differential/DifferentialReplyHandler.php
index b16dbde854..3104c04b26 100644
--- a/src/applications/differential/DifferentialReplyHandler.php
+++ b/src/applications/differential/DifferentialReplyHandler.php
@@ -162,7 +162,7 @@ class DifferentialReplyHandler extends PhabricatorMailReplyHandler {
       $exception_mail = new DifferentialExceptionMail(
         $this->getMailReceiver(),
         $ex,
-        $body);
+        $this->receivedMail->getRawTextBody());
 
       $exception_mail->setToPHIDs(array($this->getActor()->getPHID()));
       $exception_mail->send();
diff --git a/src/applications/differential/mail/DifferentialExceptionMail.php b/src/applications/differential/mail/DifferentialExceptionMail.php
index d168302054..90ceed2e8e 100644
--- a/src/applications/differential/mail/DifferentialExceptionMail.php
+++ b/src/applications/differential/mail/DifferentialExceptionMail.php
@@ -45,16 +45,13 @@ final class DifferentialExceptionMail extends DifferentialMail {
     $original_body = $this->originalBody;
 
     $message = $exception->getMessage();
-    $trace   = $exception->getTraceAsString();
 
     return <<<EOBODY
 Your request failed because an exception was encoutered while processing it:
 
 EXCEPTION: {$message}
 
-{$trace}
-
--- Original Body --------------------------
+-- Original Body -------------------------------------------------------------
 
 {$original_body}
 
diff --git a/src/applications/differential/mail/DifferentialMail.php b/src/applications/differential/mail/DifferentialMail.php
index b54b799737..1820ec1a89 100644
--- a/src/applications/differential/mail/DifferentialMail.php
+++ b/src/applications/differential/mail/DifferentialMail.php
@@ -124,7 +124,6 @@ abstract class DifferentialMail {
           '<'.implode('>, <', $reviewer_phids).'>');
       }
 
-      $cc_phids = $revision->getCCPHIDs();
       if ($cc_phids) {
         $template->addPHIDHeaders('X-Differential-CC', $cc_phids);
         $template->addHeader(
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
index f7d2122f20..4a05119952 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
@@ -222,6 +222,10 @@ final class PhabricatorMetaMTAReceivedMail extends PhabricatorMetaMTADAO {
     return $parser->stripTextBody($body);
   }
 
+  public function getRawTextBody() {
+    return idx($this->bodies, 'text');
+  }
+
   public static function loadReceiverObject($receiver_name) {
     if (!$receiver_name) {
       return null;