X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futf7.c;h=95e8fd62aa3b12f4db08659224a0daf16b407dcf;hp=8d7d206a5569a522e8296ddbfab5a1227cf035ba;hb=ee7304bbd0adad226577ac819360bfcb5326d77b;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/imap/utf7.c b/imap/utf7.c
index 8d7d206..95e8fd6 100644
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -234,8 +234,11 @@ void imap_utf7_encode (char **s)
   if (Charset) {
     char *t = str_dup (*s);
 
-    if (!mutt_convert_string (&t, Charset, "UTF-8", 0))
-      utf8_to_utf7 (t, str_len (t), s, 0);
+    if (!mutt_convert_string (&t, Charset, "UTF-8", 0)) {
+      char *u7 = utf8_to_utf7 (t, strlen (t), NULL, 0);
+      mem_free (s);
+      *s = u7;
+    }
     mem_free (&t);
   }
 }