diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
index 35651c6a78..b0f5bad0e3 100644
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -250,11 +250,24 @@ final class ManiphestTransactionEditor extends PhabricatorEditor {
       ->withPHIDs($phids)
       ->execute();
 
-    $view = new ManiphestTransactionDetailView();
-    $view->setTransactionGroup($transactions);
-    $view->setHandles($handles);
-    $view->setAuxiliaryFields($this->auxiliaryFields);
-    list($action, $main_body) = $view->renderForEmail($with_date = false);
+    $main_body = array();
+    foreach ($transactions as $transaction) {
+      $main_body[] = id(clone $transaction->getModernTransaction())
+        ->setHandles($handles)
+        ->setRenderingTarget('text')
+        ->getTitle();
+    }
+
+    foreach ($transactions as $transaction) {
+      if ($transaction->getComments()) {
+        $main_body[] = null;
+        $main_body[] = $transaction->getComments();
+      }
+    }
+
+    $main_body = implode("\n", $main_body);
+
+    $action = head($transactions)->getModernTransaction()->getActionName();
 
     $is_create = $this->isCreate($transactions);
 
diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
index 363b476b83..cb0aa64cd1 100644
--- a/src/applications/maniphest/storage/ManiphestTransaction.php
+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
@@ -52,6 +52,8 @@ final class ManiphestTransaction
           ->setCommentPHID($comment->getPHID())
           ->save();
 
+        $this->proxy->attachComment($comment);
+
         $this->pendingComment = null;
       }
     $this->proxy->saveTransaction();