diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
index 1817b7e7742da2b36b70ceaf31420210679655c9..c72993776c94520bb84d9d24f25a8bc40b1f068c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
@@ -79,6 +79,17 @@ public class MailboxActivity extends BriarActivity {
 				throw new AssertionError("Unknown state: " + state);
 			}
 		});
+
+		// re-show unpaired dialog, if it was previously shown
+		// Attention: When using BlankFragment for something else, this needs to
+		// be adapted.
+		if (savedInstanceState != null) {
+			FragmentManager fm = getSupportFragmentManager();
+			Fragment f = fm.findFragmentByTag(BlankFragment.TAG);
+			if (f != null && f.isAdded()) {
+				onUnPaired(true);
+			}
+		}
 	}
 
 	@Override