diff --git a/splitgpg2tests/tests.py b/splitgpg2tests/tests.py
index 62b6735..545da5e 100644
--- a/splitgpg2tests/tests.py
+++ b/splitgpg2tests/tests.py
@@ -424,6 +424,7 @@ def setup_tb_profile(self, setup_openpgp):
 user_pref("mail.identity.id1.compose_html", false);
 user_pref("datareporting.policy.dataSubmissionEnabled", false); // avoid message popups
 user_pref("app.donation.eoy.version.viewed", 100); // avoid message popups
+user_pref("mail.inappnotifications.enabled", false); // avoid message popups
 """
         imap_server = """
 user_pref("mail.server.server1.userName", "user");
diff --git a/tests/test_thunderbird.py b/tests/test_thunderbird.py
index c8a5d6a..f3e85d8 100644
--- a/tests/test_thunderbird.py
+++ b/tests/test_thunderbird.py
@@ -483,8 +483,7 @@ def receive_message(tb, signed=False, encrypted=False, attachment=None):
         # alternative way of opening 'message security'
         keyCombo('<Control><Alt>s')
         message_security = tb.app.child('Message Security - OpenPGP')
-    finally:
-        message_security = message_security.parent.parent
+    message_security = message_security.parent.parent
     try:
         if signed:
             message_security.child('Good Digital Signature')