diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java
index 3779cec8d..b6aa03fba 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java
@@ -104,7 +104,9 @@ public class ProducteevDetailExposer extends BroadcastReceiver {
                             append(TaskAdapter.DETAIL_SEPARATOR);
             }
 
-        } else {
+        }
+
+        if(Preferences.getBoolean(R.string.p_showNotes, false) == !extended) {
             TodorooCursor<Metadata> notesCursor = ProducteevDataService.getInstance().getTaskNotesCursor(id);
             try {
                 for(notesCursor.moveToFirst(); !notesCursor.isAfterLast(); notesCursor.moveToNext()) {
diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java
index 773fbeb0a..deb538ec0 100644
--- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java
+++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java
@@ -19,6 +19,7 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Metadata;
+import com.todoroo.astrid.utility.Preferences;
 
 /**
  * Exposes Task Details for Remember the Milk:
@@ -88,7 +89,9 @@ public class MilkDetailExposer extends BroadcastReceiver {
             if(repeat != 0) {
                 builder.append(context.getString(R.string.rmilk_TLA_repeat)).append(DETAIL_SEPARATOR);
             }
-        } else {
+        }
+
+        if(Preferences.getBoolean(R.string.p_showNotes, false) == !extended) {
             TodorooCursor<Metadata> notesCursor = milkMetadataService.getTaskNotesCursor(id);
             try {
                 for(notesCursor.moveToFirst(); !notesCursor.isAfterLast(); notesCursor.moveToNext()) {
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index d8f55fdf5..681e5a436 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -187,7 +187,7 @@ public class EditPreferences extends TodorooPreferences {
             else
                 preference.setSummary(R.string.EPr_showNotes_desc_enabled);
             if((Boolean)value != Preferences.getBoolean(preference.getKey(), false)) {
-                taskService.clearDetails(Task.NOTES.neq(""));
+                taskService.clearDetails(Criterion.all);
                 Flags.set(Flags.REFRESH);
             }
         }