diff --git a/admin/inc/class.admin_mail.inc.php b/admin/inc/class.admin_mail.inc.php
index ccd0a037f9..a7dc689085 100644
--- a/admin/inc/class.admin_mail.inc.php
+++ b/admin/inc/class.admin_mail.inc.php
@@ -893,11 +893,6 @@ class admin_mail
 					{
 						if (!$content['acc_'.$type.'_ssl']) $content['acc_'.$type.'_ssl'] = 'no';
 					}
-
-					if (!empty($content['acc_smime_password']))
-					{
-						$readonlys['smime_export_p12'] = false;
-					}
 				}
 				catch(Api\Exception\NotFound $e) {
 					if (self::$debug) _egw_log_exception($e);
@@ -1171,6 +1166,25 @@ class admin_mail
 					}
 			}
 		}
+		// SMIME UPLOAD/DELETE/EXPORT control
+		$content['hide_smime_upload'] = false;
+		if (!empty($content['acc_smime_password']))
+		{
+			if (!empty($content['smime_delete_p12']) &&
+					Mail\Credentials::delete (
+						$content['acc_id'],
+						$content['called_for'] ? $content['called_for'] : $GLOBALS['egw_info']['user']['account_id'],
+						Mail\Credentials::SMIME
+				))
+			{
+				unset($content['acc_smime_password'], $content['smimeKeyUpload'], $content['smime_delete_p12']);
+				$content['hide_smime_upload'] = false;
+			}
+			else
+			{
+				$content['hide_smime_upload'] = true;
+			}
+		}
 
 		// disable delete button for new, not yet saved entries, if no delete rights or a non-standard identity selected
 		$readonlys['button[delete]'] = empty($content['acc_id']) ||
@@ -1190,7 +1204,8 @@ class admin_mail
 			$readonlys['button[cancel]'] = false;
 			// allow to edit notification-folders
 			$readonlys['button[save]'] = $readonlys['button[apply]'] =
-				$readonlys['notify_folders'] = $readonlys['notify_use_default'] = false;
+			$readonlys['notify_folders'] = $readonlys['notify_use_default'] =
+			$readonlys['smimeKeyUpload'] = $readonlys['smime_pkcs12_password']= false;
 		}
 
 		$sel_options['acc_imap_ssl'] = $sel_options['acc_sieve_ssl'] =
diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index fa999b450a..21c9f58b46 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -305,16 +305,19 @@
 						<buttononly label="Generate Certificate" onclick="app.admin.smime_genCertificate" image="add" background_image="1"/>
 					</hbox>
 				</row>
-				<row>
+				<row disabled="@hide_smime_upload">
 					<description value="Upload your certificate .p12/.pfx file"/>
 					<vbox>
 						<file id="smimeKeyUpload" accept=".p12,.pfx"/>
 						<passwd id="smime_pkcs12_password" size="32" maxlength="128"  blur="Password to unlock encrypted p12" autocomplete="off"/>
 					</vbox>
 				</row>
-				<row>
+				<row disabled="!@hide_smime_upload">
 					<description value="Current certificate"/>
-					<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" background_image="1" readonly="true"/>
+					<hbox>
+						<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" background_image="1"/>
+						<buttononly id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete" background_image="1"/>
+					</hbox>
 				</row>
 			</rows>
 		</grid>