sync with 0.7.6cvs8

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index b10a4554c6b1c466235ef097811add6f7abe22fc..d186a53965e5d61e8ff55aea128ba6a9da95bd3c 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -361,6 +361,12 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
 
        if (!mimeinfo->sub && mimeinfo->parent)
                current = mimeview_append_part(mimeview, mimeinfo, parent);
+       if (mimeinfo->sub && !mimeinfo->sub->children &&
+           mimeinfo->sub->mime_type != MIME_TEXT &&
+           mimeinfo->sub->mime_type != MIME_TEXT_HTML) {
+               mimeview_append_part(mimeview, mimeinfo->sub, parent);
+               return;
+       }
 
        if (mimeinfo->sub)
                mimeview_set_multipart_tree(mimeview, mimeinfo->sub, current);