diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 4e588b2ec..9d50057dc 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -696,7 +696,10 @@
 				case Enums.ComposeType.ReplyAll:
 				case Enums.ComposeType.Forward:
 				case Enums.ComposeType.ForwardAsAttachment:
-					_.each(_.union(oMessage.to, oMessage.cc, oMessage.bcc, oMessage.deliveredTo), fEachHelper);
+					_.each(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fEachHelper);
+					if (!oResultIdentity) {
+						_.each(oMessage.deliveredTo, fEachHelper);
+					}
 					break;
 				case Enums.ComposeType.Draft:
 					_.each(_.union(oMessage.from, oMessage.replyTo), fEachHelper);
@@ -2183,4 +2186,4 @@
 
 	module.exports = ComposePopupView;
 
-}());
\ No newline at end of file
+}());