diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index ca763c040d..24bf63ee8c 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2416,7 +2416,13 @@ window.egw_LAB.wait(function() {
 					'addressbook.edit.upload' => false
 				));
 			}
+			if (!$readonlys['pubkey'])
+			{
+				$readonlys['addressbook:'.$content['id'].':.files/pgp-pubkey.asc'] =
+				$readonlys['addressbook:'.$content['id'].':.files/smime-pubkey.crt'] = false;
+			}
 		}
+
 		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 4ed995a16c..0824245343 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -178,11 +178,11 @@
 							</row>
 							<row valign="top">
 								<description value="SMIME key"/>
-								<vfs-upload id="addressbook:$cont[id]:.files/smime-pubkey.crt" accept=".crt,.pem,application/x-x509-ca-cert,application/x-x509-user-cert" mime="/application\/x-x509-(ca|user)-cert/" callback="addressbook.addressbook_ui.pubkey_uploaded"/>
+								<vfs-upload id="addressbook:$cont[id]:.files/smime-pubkey.crt" accept=".crt,.pem,application/x-x509-ca-cert,application/x-x509-user-cert" mime="/application\/(x-x509-(ca|user)|pkix)-cert/" callback="addressbook.addressbook_ui.pubkey_uploaded"/>
 							</row>
 							<row valign="top">
 								<description value="PGP key"/>
-								<vfs-upload id="addressbook:$cont[id]:.files/pgp-pubkey.asc" accept=".asc,application/pgp-keys" mime="application/pgp-keys" callback="addressbook.addressbook_ui.pubkey_uploaded"/>
+								<vfs-upload id="addressbook:$cont[id]:.files/pgp-pubkey.asc" accept=".asc,application/pgp-keys" mime="/(application\/pgp-keys|text\/plain)/" callback="addressbook.addressbook_ui.pubkey_uploaded"/>
 							</row>
 							<row valign="top">
 								<description for="pubkey" value="Public key"/>