diff --git a/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java b/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java
index b501af2fb..c393a9f22 100644
--- a/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java
+++ b/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java
@@ -26,7 +26,7 @@
  */
 package eu.siacs.conversations.services;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity ;
 import android.app.Application;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -113,7 +113,7 @@ public class MemorizingTrustManager {
 	static String KEYSTORE_FILE = "KeyStore.bks";
 
 	Context master;
-	Activity foregroundAct;
+	AppCompatActivity foregroundAct;
 	NotificationManager notificationManager;
 	private static int decisionId = 0;
 	private static SparseArray<MTMDecision> openDecisions = new SparseArray<MTMDecision>();
@@ -172,8 +172,8 @@ public class MemorizingTrustManager {
 			app = (Application)m;
 		} else if (m instanceof Service) {
 			app = ((Service)m).getApplication();
-		} else if (m instanceof Activity) {
-			app = ((Activity)m).getApplication();
+		} else if (m instanceof AppCompatActivity) {
+			app = ((AppCompatActivity)m).getApplication();
 		} else throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
 
 		File dir = app.getDir(KEYSTORE_DIR, Context.MODE_PRIVATE);
@@ -197,7 +197,7 @@ public class MemorizingTrustManager {
 	 *
 	 * @param act Activity to be bound
 	 */
-	public void bindDisplayActivity(Activity act) {
+	public void bindDisplayActivity(AppCompatActivity act) {
 		foregroundAct = act;
 	}
 
@@ -205,11 +205,11 @@ public class MemorizingTrustManager {
 	 * Removes an Activity from the MTM display stack.
 	 *
 	 * Always call this function when the Activity added with
-	 * {@link #bindDisplayActivity(Activity)} is hidden.
+	 * {@link #bindDisplayActivity(AppCompatActivity)} is hidden.
 	 *
 	 * @param act Activity to be unbound
 	 */
-	public void unbindDisplayActivity(Activity act) {
+	public void unbindDisplayActivity(AppCompatActivity act) {
 		// do not remove if it was overridden by a different activity
 		if (foregroundAct == act)
 			foregroundAct = null;
diff --git a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
index 6991b442d..40915b264 100644
--- a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.ui;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity ;
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
@@ -15,7 +15,7 @@ import eu.siacs.conversations.utils.zxing.IntentIntegrator;
 import eu.siacs.conversations.utils.zxing.IntentResult;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
-public class UriHandlerActivity extends Activity {
+public class UriHandlerActivity extends AppCompatActivity {
     public static final String ACTION_SCAN_QR_CODE = "scan_qr_code";
 
     @Override