diff --git a/include/class.thread_actions.php b/include/class.thread_actions.php
index 428793399807d245f86cf0592041606784cff557..6650ee09810b2854ce7fe01f318813d6584d6706 100644
--- a/include/class.thread_actions.php
+++ b/include/class.thread_actions.php
@@ -164,6 +164,11 @@ JS
             $old = $original;
         }
 
+        // Move the attachments to the new entry
+        $old->attachments->update(array(
+            'object_id' => $entry->id
+        ));
+
         // Mark the new entry as edited (but not hidden nor guarded)
         $entry->flags = ($old->flags & ~(ThreadEntry::FLAG_HIDDEN | ThreadEntry::FLAG_GUARDED))
             | ThreadEntry::FLAG_EDITED;