diff --git a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainerTest.java b/app/src/androidTest/java/org/tasks/ui/DescriptionControlSetTest.java
similarity index 75%
rename from app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainerTest.java
rename to app/src/androidTest/java/org/tasks/ui/DescriptionControlSetTest.java
index 378838b88..7217c3428 100644
--- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainerTest.java
+++ b/app/src/androidTest/java/org/tasks/ui/DescriptionControlSetTest.java
@@ -1,14 +1,14 @@
-package com.todoroo.astrid.gtasks.sync;
+package org.tasks.ui;
 
-import static com.todoroo.astrid.gtasks.sync.GtasksTaskContainer.stripCarriageReturns;
 import static org.junit.Assert.assertEquals;
+import static org.tasks.ui.DescriptionControlSet.stripCarriageReturns;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-public class GtasksTaskContainerTest {
+public class DescriptionControlSetTest {
   @Test
   public void replaceCRLF() {
     assertEquals("aaa\nbbb", stripCarriageReturns("aaa\r\nbbb"));
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
index 3d27783f8..b5bd9d394 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
@@ -38,7 +38,7 @@ public class GtasksTaskContainer {
 
     long dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(remoteTask.getDue());
     mergeDates(Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, dueDate), task);
-    task.setNotes(stripCarriageReturns(remoteTask.getNotes()));
+    task.setNotes(remoteTask.getNotes());
 
     gtaskMetadata.setRemoteId(remoteTask.getId());
     gtaskMetadata.setListId(listId);
@@ -54,8 +54,4 @@ public class GtasksTaskContainer {
   public void prepareForSaving() {
     metadata.add(gtaskMetadata);
   }
-
-  static String stripCarriageReturns(String original) {
-    return original.replaceAll("\\r\\n?", "\n");
-  }
 }
diff --git a/app/src/main/java/org/tasks/ui/DescriptionControlSet.java b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
index 40a9cf784..68f65dd08 100644
--- a/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
@@ -28,13 +28,17 @@ public class DescriptionControlSet extends TaskEditControlFragment {
 
   private String description;
 
+  static String stripCarriageReturns(String original) {
+    return original.replaceAll("\\r\\n?", "\n");
+  }
+
   @Nullable
   @Override
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = super.onCreateView(inflater, container, savedInstanceState);
     if (savedInstanceState == null) {
-      description = task.getNotes();
+      description = stripCarriageReturns(task.getNotes());
     } else {
       description = savedInstanceState.getString(EXTRA_DESCRIPTION);
     }
@@ -83,7 +87,7 @@ public class DescriptionControlSet extends TaskEditControlFragment {
   public boolean hasChanges(Task original) {
     return !(isNullOrEmpty(description)
         ? isNullOrEmpty(original.getNotes())
-        : description.equals(original.getNotes()));
+        : description.equals(stripCarriageReturns(original.getNotes())));
   }
 
   @Override