mmime: only qp after newline when actually needed

8 years ago · 0ce958a22c
parent 2aaa3cecd8
commit 0ce958a22c
1 changed files with 12 additions and 6 deletions
--- a/mmime.c
+++ b/mmime.c
@ -245,13 +245,19 @@ print_header(char *line) {
 			}
 			if (s < e) {
 				if (linelen + (e-s)+13 > 78) {
-					printf("\n");
-					linelen = 0;
+					printf("\n ");
+					linelen = 1;
+				}
+				if (highbit || s[0] == ' ') {
+					printf("=?UTF-8?Q?");
+					linelen += 13;
+					linelen += gen_qp((uint8_t *)s, e-s, 999, 1);
+					printf("?=");
+				} else {
+					fwrite(s, 1, e-s, stdout);
+					linelen += e-s;
+					prevq = 0;
 				}
-				printf(" =?UTF-8?Q?");
-				linelen += 13;
-				linelen += gen_qp((uint8_t *)s, e-s, 999, 1);
-				printf("?=");
 			}
 			prevq = 1;
 		} else {