diff --git a/dev/Stores/User/OpenPGP.js b/dev/Stores/User/OpenPGP.js
index 6137d8e59..9f5db818f 100644
--- a/dev/Stores/User/OpenPGP.js
+++ b/dev/Stores/User/OpenPGP.js
@@ -51,7 +51,7 @@ class OpenPgpKeyModel {
 		if (key.users) {
 			key.users.forEach(user => user.userID.email && aEmails.push(user.userID.email));
 		}
-		this.id = key.getKeyID().toHex();
+		this.id = key.getKeyID().toHex().toUpperCase();
 		this.fingerprint = key.getFingerprint();
 		this.can_encrypt = !!key.getEncryptionKey();
 		this.can_sign = !!key.getSigningKey();
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index bd467acf9..634e3968c 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -729,8 +729,6 @@ export class MailMessageView extends AbstractViewRight {
 					const publicKey = OpenPGPUserStore.getPublicKeyFor(sender);
 					OpenPGPUserStore.verify(message.plain(), null/*detachedSignature*/, publicKey).then(result => {
 						if (result) {
-							// TODO: if result.data is not cleartext then
-							// parse mime to find and verify signature
 							message.plain(result.data);
 							message.viewPlain();
 							console.dir({signatures:result.signatures});
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
index 9c552c90b..881095fef 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html
@@ -40,7 +40,7 @@
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Store public key on server',
+				label: 'Backup public key on server',
 				value: backupPublicKey
 			}
 		}"></div>