diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index df38c15d9..a2b26832e 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\NotificationCommentType;
 use Chill\MainBundle\Form\NotificationType;
 use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound;
 use Chill\MainBundle\Notification\NotificationHandlerManager;
@@ -177,11 +179,28 @@ class NotificationController extends AbstractController
     {
         $this->denyAccessUnlessGranted(NotificationVoter::SEE, $notification);
 
+        $notification->addComment($appendComment = new NotificationComment());
+        $appendCommentForm = $this->createForm(NotificationCommentType::class, $appendComment);
+        $appendCommentForm->handleRequest($request);
+
+        if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) {
+            $this->em->persist($appendComment);
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('notification.comment_appended'));
+
+            return $this->redirectToRoute('chill_main_notification_show', [
+                'id' => $notification->getId(),
+            ]);
+        }
+
         $response = $this->render('@ChillMain/Notification/show.html.twig', [
             'notification' => $notification,
             'handler' => $this->notificationHandlerManager->getHandler($notification),
+            'appendCommentForm' => $appendCommentForm->createView(),
         ]);
 
+        // we mark the notification as read after having computed the response
         if ($this->getUser() instanceof User && !$notification->isReadBy($this->getUser())) {
             $notification->markAsReadBy($this->getUser());
             $this->em->flush();
diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
index 73157eb01..792e4abcc 100644
--- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
@@ -68,6 +68,16 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this->content;
     }
 
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -83,6 +93,11 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this->updateAt;
     }
 
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
     public function setContent(string $content): self
     {
         $this->content = $content;
diff --git a/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php b/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php
new file mode 100644
index 000000000..7aa3a6cb1
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class NotificationCommentType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('content', ChillTextareaType::class, [
+            'required' => false,
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
index 1fbe7693b..9dd1c7cf6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -16,6 +16,37 @@
                 {{ notification.message|chill_markdown_to_html }}
             </div>
 
+            {% if notification.comments|length > 0 %}
+                {% for comment in notification.comments %}
+                    <div>
+                        <blockquote class="chill-user-quote">
+                            {{ comment.content|chill_markdown_to_html }}
+                        </blockquote>
+
+                        {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %}
+                        <ul class="record_actions">
+                            <li>
+                                <a href="#" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                        {% endif %}
+                    </div>
+                {% endfor %}
+            {% endif %}
+
+            {% if appendCommentForm is defined %}
+            <div>
+                {{ form_start(appendCommentForm) }}
+                {{ form_widget(appendCommentForm) }}
+                <ul class="record_actions">
+                    <li>
+                        <button type="submit" class="btn btn-save">{{ 'notification.append_comment'|trans }}</button>
+                    </li>
+                </ul>
+                {{ form_end(appendCommentForm) }}
+            </div>
+            {% endif %}
+
             <ul class="record_actions sticky-form-buttons">
                 <li class="cancel">
                     <a href="{{ chill_return_path_or('chill_main_notification_my') }}" class="btn btn-cancel">
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
index f0023ec12..547a39f82 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
@@ -19,18 +20,20 @@ use UnexpectedValueException;
 
 final class NotificationVoter extends Voter
 {
+    public const COMMENT_EDIT = 'CHILL_MAIN_NOTIFICATION_COMMENT_EDIT';
+
     public const SEE = 'chill_main_notification_see';
 
     public const UPDATE = 'chill_main_notification_update';
 
     protected function supports($attribute, $subject): bool
     {
-        return $subject instanceof Notification;
+        return $subject instanceof Notification || $subject instanceof NotificationComment;
     }
 
     /**
      * @param string $attribute
-     * @param Notification $subject
+     * @param mixed $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
@@ -40,12 +43,24 @@ final class NotificationVoter extends Voter
             return false;
         }
 
-        switch ($attribute) {
-            case self::SEE:
-                return $subject->getSender() === $user || $subject->getAddressees()->contains($user);
+        if ($subject instanceof Notification) {
+            switch ($attribute) {
+                case self::SEE:
+                    return $subject->getSender() === $user || $subject->getAddressees()->contains($user);
 
-            default:
-                throw new UnexpectedValueException("this subject {$subject} is not implemented");
+                default:
+                    throw new UnexpectedValueException("this subject {$attribute} is not implemented");
+            }
+        } elseif ($subject instanceof NotificationComment) {
+            switch ($attribute) {
+                case self::COMMENT_EDIT:
+                    return $subject->getCreatedBy() === $user;
+
+                default:
+                    throw new UnexpectedValueException("this subject {$attribute} is not implemented");
+            }
         }
+
+        throw new UnexpectedValueException();
     }
 }