(mu_string_unfold): Convert \n followed by any amount of whitespace to single space.

@@ -1172,13 +1172,44 @@ int
 mu_string_unfold (char *text, size_t *plen)
 mu_string_unfold (char *text, size_t *plen)
 {
 {
   char *p, *q;
   char *p, *q;
+  enum uf_state { uf_init, uf_nl, uf_fold } state = uf_init;
+#define ISSPACE(c) (c == '\r' || c == ' ' || c == '\t')
   
   
   if (!text)
   if (!text)
     return EINVAL;
     return EINVAL;
   
   
   for (p = q = text; *q; q++)
   for (p = q = text; *q; q++)
-    if (*q != '\n')
+    {
+      switch (state)
+	{
+	case uf_init:
+	  if (*q == '\n')
+	    state = uf_nl;
+	  else
+	    *p++ = *q;
+	  break;
+
+	case uf_nl:
+	  if (ISSPACE (*q))
+	    state = uf_fold;
+	  else
+	    {
+	      state = uf_init;
+	      *p++ = *q;
+	    }
+	  break;
+
+	case uf_fold:
+	  if (!ISSPACE (*q))
+	    {
+	      *p++ = ' ';
 	      *p++ = *q;
 	      *p++ = *q;
+	      state = uf_init;
+	    }
+	  break;
+	}
+    }
+  
   *p++ = 0;
   *p++ = 0;
   if (plen)
   if (plen)
     *plen = p - text;
     *plen = p - text;