diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 0070b43c4..f14c6f068 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -356,8 +356,8 @@ export class ComposePopupView extends AbstractViewPopup {
 			currentIdentity: value => {
 				if (value) {
 					this.from(value.formattedName());
-					this.doEncrypt(value.pgpEncrypt()/* || SettingsUserStore.pgpEncrypt()*/);
-					this.doSign(value.pgpSign()/* || SettingsUserStore.pgpSign()*/);
+					this.doEncrypt(value.pgpEncrypt() || SettingsUserStore.pgpEncrypt());
+					this.doSign(value.pgpSign() || SettingsUserStore.pgpSign());
 				}
 			},