diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
index af8662421..231b5b0c6 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
@@ -261,11 +261,11 @@ public class TaskDao extends DatabaseDao<Task> {
             afterComplete(task, values);
         else {
             if(values.containsKey(Task.DUE_DATE.name) ||
-                values.containsKey(Task.REMINDER_FLAGS.name) ||
-                values.containsKey(Task.REMINDER_PERIOD.name) ||
-                values.containsKey(Task.REMINDER_LAST.name) ||
-                values.containsKey(Task.REMINDER_SNOOZE.name))
-            ReminderService.getInstance().scheduleAlarm(task);
+                    values.containsKey(Task.REMINDER_FLAGS.name) ||
+                    values.containsKey(Task.REMINDER_PERIOD.name) ||
+                    values.containsKey(Task.REMINDER_LAST.name) ||
+                    values.containsKey(Task.REMINDER_SNOOZE.name))
+                ReminderService.getInstance().scheduleAlarm(task);
         }
 
         // run api save hooks
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 12c801a42..e389f9437 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -20,7 +20,6 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Criterion;
-import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
@@ -126,8 +125,8 @@ public final class UpgradeService {
                     if(from < V3_8_3_1)
                         new TagCaseMigrator().performTagCaseMigration(context);
 
-                    if(from < V3_8_4)
-                        taskService.clearDetails(Functions.length(Task.NOTES).gt(170));
+                    if(from < V3_8_4 && Preferences.getBoolean(R.string.p_showNotes, true))
+                        taskService.clearDetails(Task.NOTES.neq("")); //$NON-NLS-1$
                 } finally {
                     DialogUtilities.dismissDialog((Activity)context, dialog);
                 }