diff --git a/CHANGELOG b/CHANGELOG
index 5ec7d5ec092..13d1fc87906 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ CHANGELOG Roundcube Webmail
 - Fix regression in testing database schema on MSSQL (#7227)
 - Fix cursor position after inserting a group to a recipient input using autocompletion (#7267)
 - Fix string literals handling in IMAP STATUS (and various other) responses (#7290)
+- Fix bug where multiple images in a message were replaced by the first one on forward/reply/edit (#7293)
 
 RELEASE 1.4.3
 -------------
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index ecd2e5bbab9..903530f2890 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1036,7 +1036,7 @@ function rcmail_cid_map($message)
                 }
             }
 
-            $url = sprintf('RCMAP%s', md5($message->folder . '/' . $message->uid));
+            $url = sprintf('RCMAP%s', md5($message->folder . '/' . $message->uid . '/' . $pid));
             $idx = $part->content_id ? ('cid:' . $part->content_id) : $part->content_location;
 
             $map[$idx] = $url;