diff --git a/src/message.cpp b/src/message.cpp
index 319cb7d2..e1392639 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -130,7 +130,9 @@ static char* quoted_strchr(const char* s, int c)
     for (p = s; *p && *p != c; p++) {
         if (*p == '"') {
             p++;
-            p += strcspn(p, "\"");
+            p += strcspn(p, "\"\n");
+            if (!*p)
+                break;
         }
     }