diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index cc21d91470..4d77346c83 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1576,9 +1576,14 @@ class mail_compose
 						$suppressSigOnTop = true;
 					}
 					break;
+				case 'reply_attachments':
+					$content = $this->getForwardData($icServer, $folder, $msgUID, $part_id, 'inline');
+					// fall through (everything but attachments get overwritten)
 				case 'reply':
+				case 'reply_single':
 				case 'reply_all':
-					$content = $this->getReplyData($from == 'reply' ? 'single' : 'all', $icServer, $folder, $msgUID, $part_id);
+					$content = $this->getReplyData(str_replace('reply_', '', $from) ?: 'single',
+						$icServer, $folder, $msgUID, $part_id);
 					if ($content['mimeType'] === 'plain' && $GLOBALS['egw_info']['user']['preferences']['mail']['replyOptions'] === 'html')
 					{
 						$content['body'] = htmlspecialchars($content['body']);
@@ -2182,7 +2187,8 @@ class mail_compose
 	 * @param $_mode can be:
 	 * 		single: for a reply to one address
 	 * 		all: for a reply to all
-	 * 		forward: inlineforwarding of a message with its attachments
+	 *      attachments: (single) reply with attachments, like inline-forwarding
+	 * 		forward: inline-forwarding of a message with its attachments
 	 * @param $_icServer number (0 as it is the active Profile)
 	 * @param $_folder string
 	 * @param $_uid number
@@ -2382,7 +2388,8 @@ class mail_compose
 				foreach($newBody ? explode("\n",$newBody) : [] as $value) {
 					// Try to remove signatures from quoted parts to avoid multiple
 					// signatures problem in reply (rfc3676#section-4.3).
-					if ($_mode != 'forward' && ($hasSignature || ($hasSignature = preg_match("/^--\s[\r\n]$/",$value))))
+					if (!in_array($_mode, ['forward', 'attachments']) &&
+						($hasSignature || ($hasSignature = preg_match("/^--\s[\r\n]$/",$value))))
 					{
 						continue;
 					}
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 4633c7fe1e..c1e087728b 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -493,6 +493,7 @@ reply	mail	de	Antworten
 reply all	mail	de	Allen antworten
 reply message type	mail	de	Format Ihrer E-Mail beim Antworten/Weiterleiten
 reply to	mail	de	Antworten an
+reply with attachments	mail	de	Antworten mit Anhängen
 replying to this message failed because the content of this message seems to be encrypted and can not be decrypted properly. if you still wish to include content of this encrypted message, you may try to use forward as attachment instead.	mail	de	Die Antwort auf diese Nachricht ist fehlgeschlagen, weil der Inhalt dieser Nachricht verschlüsselt zu sein scheint und nicht richtig entschlüsselt werden kann. Wenn Sie dennoch den Inhalt dieser verschlüsselten Nachricht einbinden möchten, können Sie versuchen, statt dessen Weiterleiten als Anhang zu verwenden.
 replyto	mail	de	Antwort an
 report as ham	mail	de	Als "gute E-Mail" kennzeichnen
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index 3e44f34ce6..9b06fb3508 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -493,6 +493,7 @@ reply	mail	en	Reply
 reply all	mail	en	Reply all
 reply message type	mail	en	Reply message type
 reply to	mail	en	Reply to
+reply with attachments	mail	en	Reply with attachments
 replying to this message failed because the content of this message seems to be encrypted and can not be decrypted properly. if you still wish to include content of this encrypted message, you may try to use forward as attachment instead.	mail	en	Replying to this message failed because the content of this message seems to be encrypted and can not be decrypted properly. If you still wish to include content of this encrypted message, you may try to use forward as attachment instead.
 replyto	mail	en	replyto
 report as ham	mail	en	Report as Ham