diff --git a/components/Posting/Controller/Post.php b/components/Posting/Controller/Post.php
deleted file mode 100644
index 32028ce051..0000000000
--- a/components/Posting/Controller/Post.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-// {{{ License
-
-// This file is part of GNU social - https://www.gnu.org/software/social
-//
-// GNU social is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// GNU social is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
-
-// }}}
-
-namespace Component\Posting\Controller;
-
-use App\Core\DB\DB;
-use App\Core\Form;
-use function App\Core\I18n\_m;
-use App\Core\Security;
-use App\Entity\FileToNote;
-use App\Entity\Note;
-use App\Util\Common;
-use App\Util\Exceptiion\InvalidFormException;
-use App\Util\Exception\NoSuchNoteException;
-use Component\Media\Media;
-use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\HttpFoundation\Request;
-
-class Post
-{
-    public function reply(Request $request, string $reply_to)
-    {
-        $note = DB::find('note', ['id' => $reply_to]);
-        if ($note == null) {
-            throw new NoSuchNoteException();
-        }
-
-        $actor_id = Common::ensureLoggedIn()->getId();
-
-        $form = Form::create([
-            ['reply_to',    HiddenType::class,   ['data' => (int) $reply_to]],
-            ['content',     TextareaType::class, ['label' => ' ']],
-            ['attachments', FileType::class,     ['label' => ' ', 'multiple' => true, 'required' => false]],
-            ['reply',       SubmitType::class,   ['label' => _m('Submit')]],
-        ]);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted()) {
-            $data = $form->getData();
-            if ($form->isValid()) {
-                self::storeNote($actor_id, $data['content'], $data['attachments'], $is_local = true, $data['reply_to'], null);
-            } else {
-                throw new InvalidFormException();
-            }
-        }
-
-        return [
-            '_template' => 'note/reply.html.twig',
-            'note'      => $note,
-            'reply'     => $form->createView(),
-        ];
-    }
-
-    public static function storeNote(int $actor_id, string $content, array $attachments, bool $is_local, ?int $reply_to = null, ?int $repeat_of = null)
-    {
-        $note  = Note::create(['gsactor_id' => $actor_id, 'content' => $content, 'is_local' => $is_local, 'reply_to' => $reply_to, 'repeat_of' => $repeat_of]);
-        $files = [];
-        foreach ($attachments as $f) {
-            $nf = Media::validateAndStoreFile($f, Common::config('attachments', 'dir'),
-                                              Security::sanitize($title = $f->getClientOriginalName()),
-                                              $is_local = true, $actor_id);
-            $files[] = $nf;
-            DB::persist($nf);
-        }
-        DB::persist($note);
-        // Need file and note ids for the next step
-        DB::flush();
-        if ($attachments != []) {
-            foreach ($files as $f) {
-                DB::persist(FileToNote::create(['file_id' => $f->getId(), 'note_id' => $note->getId()]));
-            }
-            DB::flush();
-        }
-    }
-}
diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php
index dfd6b80a33..f74d7c4dc4 100644
--- a/components/Posting/Posting.php
+++ b/components/Posting/Posting.php
@@ -24,9 +24,13 @@ use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Module;
+use App\Core\Security;
+use App\Entity\FileToNote;
+use App\Entity\Note;
 use App\Util\Common;
 use App\Util\Exceptiion\InvalidFormException;
 use App\Util\Exception\RedirectException;
+use Component\Media\Media;
 use Component\Posting\Controller as C;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
@@ -80,4 +84,26 @@ class Posting extends Module
 
         return Event::next;
     }
+
+    public static function storeNote(int $actor_id, string $content, array $attachments, bool $is_local, ?int $reply_to = null, ?int $repeat_of = null)
+    {
+        $note  = Note::create(['gsactor_id' => $actor_id, 'content' => $content, 'is_local' => $is_local, 'reply_to' => $reply_to, 'repeat_of' => $repeat_of]);
+        $files = [];
+        foreach ($attachments as $f) {
+            $nf = Media::validateAndStoreFile($f, Common::config('attachments', 'dir'),
+                                              Security::sanitize($title = $f->getClientOriginalName()),
+                                              $is_local = true, $actor_id);
+            $files[] = $nf;
+            DB::persist($nf);
+        }
+        DB::persist($note);
+        // Need file and note ids for the next step
+        DB::flush();
+        if ($attachments != []) {
+            foreach ($files as $f) {
+                DB::persist(FileToNote::create(['file_id' => $f->getId(), 'note_id' => $note->getId()]));
+            }
+            DB::flush();
+        }
+    }
 }
diff --git a/plugins/Reply/Reply.php b/plugins/Reply/Reply.php
new file mode 100644
index 0000000000..7607a9438a
--- /dev/null
+++ b/plugins/Reply/Reply.php
@@ -0,0 +1,111 @@
+<?php
+
+// {{{ License
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+// }}}
+
+namespace Plugin\Reply;
+
+use App\Core\DB\DB;
+use App\Core\Event;
+use App\Core\Form;
+use App\Core\Module;
+use App\Entity\Note;
+use App\Util\Common;
+use App\Util\Exceptiion\InvalidFormException;
+use App\Util\Exception\RedirectException;
+use Componenet\Posting;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
+
+class Reply extends Module
+{
+    public function onAddRoute($r)
+    {
+        $r->connect('note_reply', '/note/reply/{reply_to<\\d*>}', [self::class, 'replyController']);
+    }
+
+    public function onAddNoteActions(Request $request, Note $note, array &$actions)
+    {
+        $is_set = false;
+        $form   = Form::create([
+            ['content',     HiddenType::class, ['label' => ' ', 'required' => false]],
+            ['attachments', HiddenType::class, ['label' => ' ', 'required' => false]],
+            ['note_id',     HiddenType::class, ['data' => $note->getId()]],
+            ['reply',       SubmitType::class, ['label' => ' ']],
+        ]);
+
+        if ('POST' === $request->getMethod() && $request->request->has('reply')) {
+            $form->handleRequest($request);
+            if ($form->isSubmitted()) {
+                $data = $form->getData();
+                // Loose comparison
+                if ($data['note_id'] != $note->getId()) {
+                    return Event::next;
+                } else {
+                    if ($form->isValid()) {
+                        if ($data['content'] !== null) {
+                            // JS submitted
+                        // TODO DO THE THING
+                        } else {
+                            // JS disabled, redirect
+                            throw new RedirectException('note_reply', ['reply_to' => $note->getId()]);
+                        }
+                    } else {
+                        throw new InvalidFormException();
+                    }
+                }
+            }
+        }
+
+        $actions[] = $form->createView();
+        return Event::next;
+    }
+
+    public function reply(Request $request, string $reply_to)
+    {
+        $user     = Common::ensureLoggedIn();
+        $actor_id = $user->getId();
+        $note     = DB::find('note', ['id' => (int) $reply_to]);
+        if ($note == null || !$note->isVisibleTo($user)) {
+            throw new NoSuchNoteException();
+        }
+
+        $form = Form::create([
+            ['content',     TextareaType::class, ['label' => ' ']],
+            ['attachments', FileType::class,     ['label' => ' ', 'multiple' => true, 'required' => false]],
+            ['reply',       SubmitType::class,   ['label' => _m('Submit')]],
+        ]);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted()) {
+            $data = $form->getData();
+            if ($form->isValid()) {
+                Posting::storeNote($actor_id, $data['content'], $data['attachments'], $is_local = true, $data['reply_to'], null);
+            } else {
+                throw new InvalidFormException();
+            }
+        }
+
+        return [
+            '_template' => 'note/reply.html.twig',
+            'note'      => $note,
+            'reply'     => $form->createView(),
+        ];
+    }
+}