diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 8a4217591..0e19ac196 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -1,5 +1,10 @@
 <div class="page-header">
     <h2><?= t('Add a comment') ?></h2>
+    <ul>
+        <li>
+            <?= $this->modal->medium('paper-plane', t('Send by email'), 'CommentMailController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
+    </ul>
 </div>
 <form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
diff --git a/app/Template/comment_mail/create.php b/app/Template/comment_mail/create.php
index 57ddeb39d..019f8a203 100644
--- a/app/Template/comment_mail/create.php
+++ b/app/Template/comment_mail/create.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Create and send comment by email') ?></h2>
+    <h2><?= t('Create and send a comment by email') ?></h2>
 </div>
 <form method="post" action="<?= $this->url->href('CommentMailController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>