--- sylpheed-0.8.5/src/compose.c.alt-reeditsig	Thu Oct  3 18:14:41 2002

+++ sylpheed-0.8.5/src/compose.c	Thu Oct  3 20:08:28 2002

@@ -1460,6 +1460,24 @@

 	gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);

 }

+static gboolean compose_attach_part_check(Compose *compose, MimeInfo *child)

+{

+	/* Skip main text part of a signed message */

+	if (child->parent && child->parent->parent

+	    && !strcasecmp(child->parent->parent->content_type,

+			   "multipart/signed")

+	    && child->mime_type == MIME_TEXT)

+		return FALSE;

+

+	/* Skip PGP/MIME signature */

+	if (g_strcasecmp(child->content_type,

+			 "application/pgp-signature") == 0) {

+		return FALSE;

+	}

+

+	return TRUE;

+}

+

 #define IS_FIRST_PART_TEXT(info) \

 	((info->mime_type == MIME_TEXT || info->mime_type == MIME_TEXT_HTML) || \

 	 (info->mime_type == MIME_MULTIPART && info->content_type && \

@@ -1490,7 +1508,9 @@

 	infile = procmsg_get_message_file_path(msginfo);

 	while (child != NULL) {

-		if (child->children || child->mime_type == MIME_MULTIPART) {

+		if (child->children

+		    || child->mime_type == MIME_MULTIPART

+		    || !compose_attach_part_check(compose, child)) {

 			child = procmime_mimeinfo_next(child);

 			continue;

 		}