Index: src/messageview.c
===================================================================
RCS file: //claws/src/messageview.c,v
retrieving revision 1.94.2.235
retrieving revision 1.94.2.236
diff -u -r1.94.2.235 -r1.94.2.236
--- src/messageview.c	10 Jul 2012 21:13:07 -0000	1.94.2.235
+++ src/messageview.c	12 Aug 2012 10:10:36 -0000	1.94.2.236
@@ -1469,6 +1469,7 @@
 						goto done;
 					} else if (mimeinfo->type == MIMETYPE_TEXT && 
 					    !strcasecmp(mimeinfo->subtype, "html") &&
+					    mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT &&
 					    prefs_common.promote_html_part) {
 						mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
 						goto done;
@@ -1487,6 +1488,7 @@
 						 * not to show html attachments */
 						continue;
 					}
+					
 					if (mimeinfo->type == MIMETYPE_TEXT && 
 					    !strcasecmp(mimeinfo->subtype, "calendar") &&
 					    mimeview_has_viewer_for_content_type(messageview->mimeview,
@@ -1495,6 +1497,7 @@
 						goto done;
 					} else if (mimeinfo->type == MIMETYPE_TEXT && 
 					    !strcasecmp(mimeinfo->subtype, "html") &&
+					    mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT &&
 					    prefs_common.promote_html_part) {
 						mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
 						goto done;
Index: src/common/ssl.c
===================================================================
RCS file: //claws/src/common/ssl.c,v
retrieving revision 1.9.2.54
retrieving revision 1.9.2.55
diff -u -r1.9.2.54 -r1.9.2.55
--- src/common/ssl.c	9 Aug 2012 11:32:26 -0000	1.9.2.54
+++ src/common/ssl.c	12 Aug 2012 10:10:36 -0000	1.9.2.55
@@ -152,7 +152,7 @@
 	}
 	return NULL;
 #else
-	return "put_what_s_needed_here";
+	return NULL;
 #endif
 }