diff --git a/phpBB/posting.php b/phpBB/posting.php
index 9bd4acf99b..4986909148 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1593,6 +1593,9 @@ $message_parser->decode_message($post_data['bbcode_uid']);
 
 if ($generate_quote)
 {
+	// Remove attachment bbcode tags from the quoted message to avoid mixing with the new post attachments if any
+	$message_parser->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#uis', '\\2', $message_parser->message);
+
 	if ($config['allow_bbcode'])
 	{
 		$message_parser->message = $phpbb_container->get('text_formatter.utils')->generate_quote(