Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.1943.2.23
diff -u -r1.1943.2.23 ChangeLog
--- ChangeLog	2002/01/23 16:52:20	1.1943.2.23
+++ ChangeLog	2002/02/08 19:00:46
@@ -1,3 +1,9 @@
+2002-02-08  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-format.c (try_inline_pgp_sig): Handle cases where there
+	isn't a hash header (apparently some PGP versions don't use them
+	and/or are configurable to not display them?). Fixes bug #18935.
+
 2002-01-23  Dan Winship  <danw@ximian.com>
 
 	* mail-folder-cache.c (mail_note_store): Allow this to be called
Index: mail-format.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-format.c,v
retrieving revision 1.209.4.1
diff -u -r1.209.4.1 mail-format.c
--- mail-format.c	2001/12/14 19:36:21	1.209.4.1
+++ mail-format.c	2002/02/08 19:00:47
@@ -1377,15 +1377,19 @@
 	
 	/* We know start points to "-----BEGIN PGP SIGNED MESSAGE-----\n" */
 	msg_start = start + sizeof ("-----BEGIN PGP SIGNED MESSAGE-----\n") - 1;
-	/* Skip 'One or more "Hash" Armor Headers' followed by
-	 * 'Exactly one empty line'.
-	 */
-	msg_start = strstr (msg_start, "\n\n");
-	if (!msg_start)
-		return start;
-	msg_start += 2;
+	
+	if (*msg_start != '\n') {
+		/* Skip 'One or more "Hash" Armor Headers' followed by
+		 * 'Exactly one empty line'.
+		 */
+		msg_start = strstr (msg_start, "\n\n");
+		if (!msg_start)
+			return start;
+		msg_start += 2;
+	}
+	
 	msg_end = strstr (msg_start, "\n-----BEGIN PGP SIGNATURE-----\n");
-	if (!msg_end)
+	if (!msg_end || msg_end == msg_start)
 		return start;
 	
 	sig_start = msg_end;
