diff --git a/src/com/android/messaging/ui/BugleActionBarActivity.java b/src/com/android/messaging/ui/BugleActionBarActivity.java
index 80dabb8..5d9c63a 100644
--- a/src/com/android/messaging/ui/BugleActionBarActivity.java
+++ b/src/com/android/messaging/ui/BugleActionBarActivity.java
@@ -19,7 +19,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -40,7 +40,7 @@
  * needs that will be common for all activities.  We can break out the common code if/when we need
  * a version that doesn't use an actionbar.
  */
-public class BugleActionBarActivity extends ActionBarActivity implements ImeUtil.ImeStateHost {
+public class BugleActionBarActivity extends AppCompatActivity implements ImeUtil.ImeStateHost {
     // Tracks the list of observers opting in for IME state change.
     private final Set<ImeUtil.ImeStateObserver> mImeStateObservers = new HashSet<>();
 
diff --git a/src/com/android/messaging/util/UiUtils.java b/src/com/android/messaging/util/UiUtils.java
index 84fe353..e446c73 100644
--- a/src/com/android/messaging/util/UiUtils.java
+++ b/src/com/android/messaging/util/UiUtils.java
@@ -27,7 +27,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextPaint;
@@ -370,7 +370,7 @@
         return result.toString();
     }
 
-    public static void setActionBarShadowVisibility(final ActionBarActivity activity, final boolean visible) {
+    public static void setActionBarShadowVisibility(final AppCompatActivity activity, final boolean visible) {
         final ActionBar actionBar = activity.getSupportActionBar();
         actionBar.setElevation(visible ?
                 activity.getResources().getDimensionPixelSize(R.dimen.action_bar_elevation) :