diff --git a/res/values/styles.xml b/res/values/styles.xml
index a935075f9d..8b8bd1689e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="NoAnimation.Theme.Sherlock.Light.DarkActionBar" parent="@style/Theme.Sherlock.Light.DarkActionBar">
         <item name="android:windowAnimationStyle">@null</item>        
     </style>
@@ -76,7 +76,8 @@
         <item name="android:textColor">@color/textsecure_holo_blue_light</item>
     </style>
 
-    <style name="TextSecureDialogButtonBar">
+    <style name="TextSecureDialogButtonBar"
+           tools:ignore="NewApi">
         <item name="android:background">@null</item>
         <item name="android:dividerPadding">0dp</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e033afe110..a8874d72a6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="TextSecure.LightTheme" parent="@style/Theme.Sherlock.Light">
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_light</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_light</item>
@@ -37,7 +37,9 @@
 
     </style>
 
-    <style name="TextSecure.LightTheme.NavigationDrawer" parent="@style/TextSecure.LightTheme">
+    <style name="TextSecure.LightTheme.NavigationDrawer"
+           parent="@style/TextSecure.LightTheme"
+           tools:ignore="NewApi">
         <item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
         <item name="homeAsUpIndicator">@drawable/ic_drawer</item>
         <item name="navigation_drawer_background">@color/abs__background_holo_light</item>
@@ -81,7 +83,9 @@
         <item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
     </style>
 
-    <style name="TextSecure.DarkTheme.NavigationDrawer" parent="@style/TextSecure.DarkTheme">
+    <style name="TextSecure.DarkTheme.NavigationDrawer"
+           parent="@style/TextSecure.DarkTheme"
+           tools:ignore="NewApi">
         <item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
         <item name="homeAsUpIndicator">@drawable/ic_drawer</item>
         <item name="navigation_drawer_background">#ff333333</item>
@@ -90,7 +94,9 @@
         <item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
     </style>
 
-    <style name="TextSecure.Light.Dialog" parent="@android:style/Theme.Dialog">
+    <style name="TextSecure.Light.Dialog"
+           parent="@android:style/Theme.Dialog"
+           tools:ignore="NewApi">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item>
         <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java
index 26e44efad1..03e8626b49 100644
--- a/src/org/thoughtcrime/securesms/util/Util.java
+++ b/src/org/thoughtcrime/securesms/util/Util.java
@@ -16,6 +16,7 @@
  */
 package org.thoughtcrime.securesms.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.text.Spannable;
@@ -144,6 +145,7 @@ public class Util {
     return baos.toByteArray();
   }
 
+  @SuppressLint("NewApi")
   public static boolean isDefaultSmsProvider(Context context){
     return (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) ||
       (context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context)));