diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java
index b246c9675..fedce1adb 100644
--- a/k9mail/src/main/java/com/fsck/k9/K9.java
+++ b/k9mail/src/main/java/com/fsck/k9/K9.java
@@ -237,7 +237,7 @@ public class K9 extends Application {
     private static boolean mHideSpecialAccounts = false;
     private static boolean mAutofitWidth;
     private static boolean mQuietTimeEnabled = false;
-    private static boolean mQuietTimeNotificationEnabled = false;
+    private static boolean mNotificationDuringQuietTimeEnabled = true;
     private static String mQuietTimeStarts = null;
     private static String mQuietTimeEnds = null;
     private static String mAttachmentDefaultPath = "";
@@ -475,7 +475,7 @@ public class K9 extends Application {
         editor.putBoolean("useVolumeKeysForListNavigation", mUseVolumeKeysForListNavigation);
         editor.putBoolean("autofitWidth", mAutofitWidth);
         editor.putBoolean("quietTimeEnabled", mQuietTimeEnabled);
-        editor.putBoolean("quietTimeNotificationEnabled", mQuietTimeNotificationEnabled);
+        editor.putBoolean("notificationDuringQuietTimeEnabled", mNotificationDuringQuietTimeEnabled);
         editor.putString("quietTimeStarts", mQuietTimeStarts);
         editor.putString("quietTimeEnds", mQuietTimeEnds);
 
@@ -710,7 +710,7 @@ public class K9 extends Application {
         mAutofitWidth = sprefs.getBoolean("autofitWidth", true);
 
         mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false);
-        mQuietTimeNotificationEnabled = sprefs.getBoolean("quietTimeNotificationEnabled", false);
+        mNotificationDuringQuietTimeEnabled = sprefs.getBoolean("notificationDuringQuietTimeEnabled", true);
         mQuietTimeStarts = sprefs.getString("quietTimeStarts", "21:00");
         mQuietTimeEnds = sprefs.getString("quietTimeEnds", "7:00");
 
@@ -973,12 +973,12 @@ public class K9 extends Application {
         mQuietTimeEnabled = quietTimeEnabled;
     }
 
-    public static boolean getQuietTimeNotificationEnabled() {
-        return mQuietTimeNotificationEnabled;
+    public static boolean isNotificationDuringQuietTimeEnabled() {
+        return mNotificationDuringQuietTimeEnabled;
     }
 
-    public static void setQuietTimeNotificationEnabled(boolean quietTimeNotificationEnabled) {
-        mQuietTimeNotificationEnabled = quietTimeNotificationEnabled;
+    public static void setNotificationDuringQuietTimeEnabled(boolean notificationDuringQuietTimeEnabled) {
+        mNotificationDuringQuietTimeEnabled = notificationDuringQuietTimeEnabled;
     }
 
     public static String getQuietTimeStarts() {
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
index acd8d0a34..c4482e9cf 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
@@ -79,7 +79,8 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
     private static final String PREFERENCE_MESSAGEVIEW_SHOW_NEXT = "messageview_show_next";
     private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled";
-    private static final String PREFERENCE_QUIET_TIME_NOTIFICATION_ENABLED = "quiet_time_notification_enabled";
+    private static final String PREFERENCE_DISABLE_NOTIFICATION_DURING_QUIET_TIME =
+            "disable_notifications_during_quiet_time";
     private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts";
     private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends";
     private static final String PREFERENCE_NOTIF_QUICK_DELETE = "notification_quick_delete";
@@ -143,7 +144,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxListPreference mVisibleRefileActions;
 
     private CheckBoxPreference mQuietTimeEnabled;
-    private CheckBoxPreference mQuietTimeNotificationEnabled;
+    private CheckBoxPreference mDisableNotificationDuringQuietTime;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeStarts;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeEnds;
     private ListPreference mNotificationQuickDelete;
@@ -311,8 +312,9 @@ public class Prefs extends K9PreferenceActivity {
         mQuietTimeEnabled = (CheckBoxPreference) findPreference(PREFERENCE_QUIET_TIME_ENABLED);
         mQuietTimeEnabled.setChecked(K9.getQuietTimeEnabled());
 
-        mQuietTimeNotificationEnabled = (CheckBoxPreference) findPreference(PREFERENCE_QUIET_TIME_NOTIFICATION_ENABLED);
-        mQuietTimeNotificationEnabled.setChecked(K9.getQuietTimeNotificationEnabled());
+        mDisableNotificationDuringQuietTime = (CheckBoxPreference) findPreference(
+                PREFERENCE_DISABLE_NOTIFICATION_DURING_QUIET_TIME);
+        mDisableNotificationDuringQuietTime.setChecked(!K9.isNotificationDuringQuietTimeEnabled());
         mQuietTimeStarts = (TimePickerPreference) findPreference(PREFERENCE_QUIET_TIME_STARTS);
         mQuietTimeStarts.setDefaultValue(K9.getQuietTimeStarts());
         mQuietTimeStarts.setSummary(K9.getQuietTimeStarts());
@@ -489,7 +491,7 @@ public class Prefs extends K9PreferenceActivity {
         K9.setMessageViewCopyActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_COPY]);
         K9.setMessageViewSpamActionVisible(enabledRefileActions[VISIBLE_REFILE_ACTIONS_SPAM]);
 
-        K9.setQuietTimeNotificationEnabled(mQuietTimeNotificationEnabled.isChecked());
+        K9.setNotificationDuringQuietTimeEnabled(!mDisableNotificationDuringQuietTime.isChecked());
         K9.setQuietTimeStarts(mQuietTimeStarts.getTime());
         K9.setQuietTimeEnds(mQuietTimeEnds.getTime());
         K9.setWrapFolderNames(mWrapFolderNames.isChecked());
diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
index 94bf7fe55..ba3e77ede 100644
--- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
+++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -4683,10 +4683,8 @@ public class MessagingController implements Runnable {
     /**
      * Creates a notification of a newly received message.
      */
-    private void notifyAccount(Context context, Account account,
-            LocalMessage message, int previousUnreadMessageCount) {
-    	// if it's quiet time and notifications are disabled, then we shouldn't show a notification
-        if (K9.isQuietTime() && K9.getQuietTimeNotificationEnabled()) {
+    private void notifyAccount(Context context, Account account, LocalMessage message, int previousUnreadMessageCount) {
+        if (K9.isQuietTime() && !K9.isNotificationDuringQuietTimeEnabled()) {
             return;
         }
 
diff --git a/k9mail/src/main/res/values/strings.xml b/k9mail/src/main/res/values/strings.xml
index 873f37b06..22a7ddc17 100644
--- a/k9mail/src/main/res/values/strings.xml
+++ b/k9mail/src/main/res/values/strings.xml
@@ -353,8 +353,8 @@ Please submit bug reports, contribute new features and ask questions at
 
     <string name="quiet_time">Quiet Time</string>
     <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>
-    <string name="quiet_time_notification">Quiet Time notifications</string>
-    <string name="quiet_time_notification_description">Disable notifications during quiet time</string>
+    <string name="quiet_time_notification">Disable notifications</string>
+    <string name="quiet_time_notification_description">Completely disable notifications during Quiet Time</string>
     <string name="quiet_time_starts">Quiet Time starts</string>
     <string name="quiet_time_ends">Quiet Time ends</string>
 
diff --git a/k9mail/src/main/res/xml/global_preferences.xml b/k9mail/src/main/res/xml/global_preferences.xml
index 77c18cc10..9ce88ffca 100644
--- a/k9mail/src/main/res/xml/global_preferences.xml
+++ b/k9mail/src/main/res/xml/global_preferences.xml
@@ -304,7 +304,7 @@
             android:summary="@string/quiet_time_description"
             />
         <CheckBoxPreference
-            android:key="quiet_time_notification_enabled"
+            android:key="disable_notifications_during_quiet_time"
             android:persistent="false"
             android:dependency="quiet_time_enabled"
             android:title="@string/quiet_time_notification"