diff --git a/app/Templates/comment_create.php b/app/Templates/comment_create.php
index 71a4f0447..11772f754 100644
--- a/app/Templates/comment_create.php
+++ b/app/Templates/comment_create.php
@@ -6,12 +6,14 @@
     <?= Helper\form_csrf() ?>
     <?= Helper\form_hidden('task_id', $values) ?>
     <?= Helper\form_hidden('user_id', $values) ?>
-    <?= Helper\form_textarea('comment', $values, $errors, array('autofocus', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
+    <?= Helper\form_textarea('comment', $values, $errors, array(! isset($skip_cancel) ? 'autofocus' : '', 'required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
     <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-        <?= t('or') ?>
-        <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+        <?php if (! isset($skip_cancel)): ?>
+            <?= t('or') ?>
+            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+        <?php endif ?>
     </div>
 </form>
diff --git a/app/Templates/task_comments.php b/app/Templates/task_comments.php
index acd84952f..12deff985 100644
--- a/app/Templates/task_comments.php
+++ b/app/Templates/task_comments.php
@@ -11,5 +11,17 @@
             'not_editable' => isset($not_editable) && $not_editable,
         )) ?>
     <?php endforeach ?>
+
+    <?php if (! isset($not_editable)): ?>
+        <?= Helper\template('comment_create', array(
+                'skip_cancel' => true,
+                'values' => array(
+                    'user_id' => Helper\get_user_id(),
+                    'task_id' => $task['id'],
+                ),
+                'errors' => array(),
+                'task' => $task
+        )) ?>
+    <?php endif ?>
 </div>
 <?php endif ?>
\ No newline at end of file
diff --git a/assets/css/app.css b/assets/css/app.css
index a2255075f..b4f8f6a6b 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -904,6 +904,11 @@ a.task-board-nobody {
     max-width: 800px;
 }
 
+#comments .comment-textarea {
+    height: 80px;
+    width: 500px;
+}
+
 /* subtasks */
 .subtasks-table {
     font-size: 0.85em;
diff --git a/docs/coding-standards.markdown b/docs/coding-standards.markdown
index a69751909..e0e762dba 100644
--- a/docs/coding-standards.markdown
+++ b/docs/coding-standards.markdown
@@ -7,6 +7,7 @@ PHP code
 - Indentation: 4 spaces
 - Line return: Unix => `\n`
 - Encoding: UTF-8
+- Use only the opening tags `<?php` or `<?=` for templates, but **never** use `<?`
 - Always write PHPdoc comments for methods and class properties
 - Coding style: Try to follow [PSR-1](http://www.php-fig.org/psr/psr-1/) and [PSR-2](http://www.php-fig.org/psr/psr-2/) otherwise follow the actual style.