diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 543df8e8b0..b76586e59e 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import android.animation.Animator;
+import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -149,6 +150,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     return false;
   }
 
+  @Override
+  @SuppressLint("MissingSuperCall") // no fragments to dispatch to
   public void onActivityResult(int requestCode, int resultcode, Intent data) {
     if (requestCode != 1) return;
 
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 2d2673bfb9..0147db7b01 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -177,6 +177,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
   }
 
   @Override
+  @SuppressLint("MissingSuperCall") // no fragments to dispatch to
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     if (requestCode == PICK_COUNTRY && resultCode == RESULT_OK && data != null) {
       this.countryCode.setText(String.valueOf(data.getIntExtra("country_code", 1)));
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 0c8d4486eb..3934fedbae 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -384,6 +384,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
     Log.i(TAG, "onNewIntent()");
     
     if (isFinishing()) {