diff --git a/ChangeLog b/ChangeLog
index 3dcf4de03..e364b91e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,6 +102,8 @@
    contained certain tokens (like 'Due:').
  + Fixed bug #654, which broke the info command when a task had no journal
    entries.
+ + Fixed bug #671, removing the claim in the 'edit' command claims that
+   description text can wrap over multiple lines, because it cannot.
 
 ------ old releases ------------------------------
 
diff --git a/src/edit.cpp b/src/edit.cpp
index c5dd9f941..99ca91ad8 100644
--- a/src/edit.cpp
+++ b/src/edit.cpp
@@ -147,13 +147,8 @@ static std::string formatTask (Task task)
   if (verbose)
     before << "# Separate the tags with spaces, like this: tag1 tag2\n";
 
-  before   << "  Tags:              " << allTags                                        << "\n";
-
-  if (verbose)
-    before << "# The description field is allowed to wrap and use multiple lines.  Task\n"
-           << "# will combine them.\n";
-
-  before << "  Description:       " << task.get ("description")                         << "\n"
+  before << "  Tags:              " << allTags                                          << "\n"
+         << "  Description:       " << task.get ("description")                         << "\n"
          << "  Created:           " << formatDate (task, "entry")                       << "\n"
          << "  Started:           " << formatDate (task, "start")                       << "\n"
          << "  Ended:             " << formatDate (task, "end")                         << "\n"