diff --git a/tests/t1000-addlist.sh b/tests/t1000-addlist.sh
index 74cb037..83680c5 100755
--- a/tests/t1000-addlist.sh
+++ b/tests/t1000-addlist.sh
@@ -77,4 +77,37 @@ TODO: 5 added.
 TODO: 5 of 5 tasks shown
 EOF
 
+#
+# Advanced add
+#
+
+cat /dev/null > todo.txt
+test_todo_session 'add with spaces' <<EOF
+>>> todo.sh add "notice the   three   spaces"
+1 notice the   three   spaces
+TODO: 1 added.
+
+>>> todo.sh add notice how the   spaces    get lost
+2 notice how the spaces get lost
+TODO: 2 added.
+
+>>> todo.sh list
+2 notice how the spaces get lost
+1 notice the   three   spaces
+--
+TODO: 2 of 2 tasks shown
+EOF
+
+cat /dev/null > todo.txt
+test_todo_session 'add with CR' <<EOF
+>>> todo.sh add "smell the
Carriage Return"
+1 smell the Carriage Return
+TODO: 1 added.
+
+>>> todo.sh list
+1 smell the Carriage Return
+--
+TODO: 1 of 1 tasks shown
+EOF
+
 test_done
diff --git a/tests/t1100-replace.sh b/tests/t1100-replace.sh
index 370446f..068ab5c 100755
--- a/tests/t1100-replace.sh
+++ b/tests/t1100-replace.sh
@@ -89,6 +89,14 @@ TODO: Replaced task with:
 1 thrash the hay & thrash the wheat
 EOF
 
+echo 'jump on hay' > todo.txt
+test_todo_session 'replace with spaces' <<EOF
+>>> todo.sh replace 1 "notice the   three   spaces"
+1 jump on hay
+TODO: Replaced task with:
+1 notice the   three   spaces
+EOF
+
 cat > todo.txt <<EOF
 smell the cows
 grow some corn
diff --git a/tests/t1400-prepend.sh b/tests/t1400-prepend.sh
index 5ddd925..48619b6 100755
--- a/tests/t1400-prepend.sh
+++ b/tests/t1400-prepend.sh
@@ -57,6 +57,12 @@ test_todo_session 'prepend with &' <<EOF
 3 no running & jumping now stop
 EOF
 
+echo 'jump on hay' > todo.txt
+test_todo_session 'prepend with spaces' <<EOF
+>>> todo.sh prepend 1 "notice the   three   spaces and"
+1 notice the   three   spaces and jump on hay
+EOF
+
 cat > todo.txt <<EOF
 smell the cows
 grow some corn
diff --git a/tests/t1600-append.sh b/tests/t1600-append.sh
index e75de78..a04ce85 100755
--- a/tests/t1600-append.sh
+++ b/tests/t1600-append.sh
@@ -43,6 +43,12 @@ test_todo_session 'basic append with &' <<EOF
 TODO: 1 of 1 tasks shown
 EOF
 
+echo 'jump on hay' > todo.txt
+test_todo_session 'append with spaces' <<EOF
+>>> todo.sh append 1 "and notice the   three   spaces"
+1 jump on hay and notice the   three   spaces
+EOF
+
 cat > todo.txt <<EOF
 smell the cows
 grow some corn
diff --git a/todo.sh b/todo.sh
index 70a87fd..1840cd3 100755
--- a/todo.sh
+++ b/todo.sh
@@ -269,7 +269,7 @@ cleaninput()
 {
     # Cleanup the input
     # Replace newlines with spaces Always
-    input=`echo $input | tr -d '\r\n'`
+    input=`printf %s "$input" | tr '\r\n' ' '`
 
     if [ "$1" = "for sed" ]; then
         # This action uses sed with "|" as the substitution separator, and & as