many ompi fixes

1 files changed, 18 insertions, 3 deletions

diff --git a/kmicromail/libetpan/mime/mailmime_decode.c b/kmicromail/libetpan/mime/mailmime_decode.c
index dbaeb68..b2ab0f7 100644
--- a/kmicromail/libetpan/mime/mailmime_decode.c
+++ b/kmicromail/libetpan/mime/mailmime_decode.c
@@ -119,4 +119,5 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
   type = TYPE_ERROR; /* XXX - removes a gcc warning */
-
-  while (1) {
+  // LUTZ add
+  int appendNewLine = FALSE;
+  while (1) { //while
 
@@ -201,3 +202,13 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
         }
-        
+              // LUTZ add
+              if ( appendNewLine ) {
+                  appendNewLine = FALSE;
+              if (mmap_string_append(gphrase, "\n") == NULL) {
+                  free(wordutf8);
+                  free(raw_word);
+                  res = MAILIMF_ERROR_MEMORY;
+                  goto free;
+              }
+              }
+              //fprintf(stderr,"append *%s*  \n",wordutf8 );
         if (mmap_string_append(gphrase, wordutf8) == NULL) {
@@ -214,3 +225,7 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
       else if (r == MAILIMF_ERROR_PARSE) {
+              // LUTZ add
+              if ( cur_token >= length )
 	break;
+              ++cur_token;
+              appendNewLine = TRUE;
       }