Index: src/plugins/pgpinline/pgpinline.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/plugins/pgpinline/Attic/pgpinline.c,v
retrieving revision 1.1.2.8
diff -u -r1.1.2.8 pgpinline.c
--- src/plugins/pgpinline/pgpinline.c	21 Oct 2005 17:31:15 -0000	1.1.2.8
+++ src/plugins/pgpinline/pgpinline.c	13 Jan 2006 06:24:52 -0000
@@ -164,10 +164,20 @@
 	
 	if (procmime_mimeinfo_parent(mimeinfo) == NULL)
 		return FALSE; /* not parent */
-
-	if (mimeinfo->type != MIMETYPE_TEXT)
-		return FALSE;
 	
+	if (mimeinfo->type != MIMETYPE_TEXT &&
+		(mimeinfo->type != MIMETYPE_APPLICATION ||
+		 g_ascii_strcasecmp(mimeinfo->subtype, "pgp")))
+		return FALSE;
+
+	/* Seal the deal. This has to be text/plain through and through. */
+	if (mimeinfo->type == MIMETYPE_APPLICATION)
+	{
+		mimeinfo->type = MIMETYPE_TEXT;
+		g_free(mimeinfo->subtype);
+		mimeinfo->subtype = g_strdup("plain");
+	}
+
 	if (mimeinfo->privacy != NULL) {
 		data = (PrivacyDataPGP *) mimeinfo->privacy;
 		if (data->done_sigtest)
@@ -307,9 +317,19 @@
 	if (procmime_mimeinfo_parent(mimeinfo) == NULL)
 		return FALSE; /* not parent */
 	
-	if (mimeinfo->type != MIMETYPE_TEXT)
+	if (mimeinfo->type != MIMETYPE_TEXT &&
+		(mimeinfo->type != MIMETYPE_APPLICATION ||
+		 g_ascii_strcasecmp(mimeinfo->subtype, "pgp")))
 		return FALSE;
 	
+	/* Seal the deal. This has to be text/plain through and through. */
+	if (mimeinfo->type == MIMETYPE_APPLICATION)
+	{
+		mimeinfo->type = MIMETYPE_TEXT;
+		g_free(mimeinfo->subtype);
+		mimeinfo->subtype = g_strdup("plain");
+	}
+	
 	textdata = get_part_as_string(mimeinfo);
 	if (!textdata)
 		return FALSE;