diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 52c2e4f47..857a1dc43 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -621,9 +621,6 @@ public abstract class XmppActivity extends Activity {
 									(isChecked) ? SQLiteAxolotlStore.Trust.TRUSTED :
 											SQLiteAxolotlStore.Trust.UNTRUSTED);
 						}
-						refreshUi();
-						xmppConnectionService.updateAccountUi();
-						xmppConnectionService.updateConversationUi();
 					}
 				},
 				new View.OnClickListener() {
@@ -631,9 +628,7 @@ public abstract class XmppActivity extends Activity {
 					public void onClick(View v) {
 						account.getAxolotlService().setFingerprintTrust(fingerprint,
 								SQLiteAxolotlStore.Trust.UNTRUSTED);
-						refreshUi();
-						xmppConnectionService.updateAccountUi();
-						xmppConnectionService.updateConversationUi();
+						v.setEnabled(true);
 					}
 				}