diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 72662ef45..4d9d92c27 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1138,7 +1138,7 @@
 					oEditor.modeToggle(false);
 				}
 
-				if (oIdentity)
+				if (oIdentity && Enums.ComposeType.Draft !== sComposeType && Enums.ComposeType.EditAsNew !== sComposeType)
 				{
 					self.setSignatureFromIdentity(oIdentity);
 				}
@@ -1182,7 +1182,7 @@
 					oEditor.modeToggle(false);
 				}
 
-				if (oIdentity)
+				if (oIdentity && Enums.ComposeType.Draft !== sComposeType && Enums.ComposeType.EditAsNew !== sComposeType)
 				{
 					self.setSignatureFromIdentity(oIdentity);
 				}