diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 383b8bfebf..c0d1f8d3d0 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -97,10 +97,22 @@ public class MessageNotifier {
 
 
   public static void updateNotification(Context context, MasterSecret masterSecret) {
+    if (!PreferenceManager.getDefaultSharedPreferences(context)
+                          .getBoolean(ApplicationPreferencesActivity.NOTIFICATION_PREF, true))
+    {
+      return;
+    }
+
     updateNotification(context, masterSecret, false);
   }
 
   public static void updateNotification(Context context, MasterSecret masterSecret, long threadId) {
+    if (!PreferenceManager.getDefaultSharedPreferences(context)
+                          .getBoolean(ApplicationPreferencesActivity.NOTIFICATION_PREF, true))
+    {
+      return;
+    }
+
     if (visibleThread == threadId) {
       DatabaseFactory.getThreadDatabase(context).setRead(threadId);
       sendInThreadNotification(context);