diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index 9a8fc83..1d31348 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -2,7 +2,6 @@ package i2p.bote.android;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -17,6 +16,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
diff --git a/app/src/main/java/i2p/bote/android/NewEmailFragment.java b/app/src/main/java/i2p/bote/android/NewEmailFragment.java
index 55d8294..2d8d602 100644
--- a/app/src/main/java/i2p/bote/android/NewEmailFragment.java
+++ b/app/src/main/java/i2p/bote/android/NewEmailFragment.java
@@ -2,7 +2,6 @@ package i2p.bote.android;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -12,6 +11,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -47,9 +47,9 @@ import javax.mail.internet.InternetAddress;
 
 import i2p.bote.I2PBote;
 import i2p.bote.android.util.BoteHelper;
-import i2p.bote.android.widget.ContactsCompletionView;
 import i2p.bote.android.util.ContentAttachment;
 import i2p.bote.android.util.Person;
+import i2p.bote.android.widget.ContactsCompletionView;
 import i2p.bote.email.Attachment;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailIdentity;
diff --git a/app/src/main/java/i2p/bote/android/util/BoteHelper.java b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
index fd99ffd..9ca6e77 100644
--- a/app/src/main/java/i2p/bote/android/util/BoteHelper.java
+++ b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
@@ -1,6 +1,5 @@
 package i2p.bote.android.util;
 
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -13,6 +12,7 @@ import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java b/app/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
index c9d18fb..156c004 100644
--- a/app/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
+++ b/app/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
@@ -1,19 +1,20 @@
 package i2p.bote.android.util;
 
-import i2p.bote.I2PBote;
-import i2p.bote.android.R;
-import i2p.bote.folder.EmailFolder;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.folder.EmailFolder;
 
 public class MoveToDialogFragment extends DialogFragment {
     public static final String CURRENT_FOLDER = "current_folder";
diff --git a/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java b/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
index 4c293f5..6cea109 100644
--- a/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
+++ b/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
@@ -1,7 +1,6 @@
 package i2p.bote.android.util;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,6 +15,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;