--- jitterbug-1.6.2.i18n/source/new_message.c-oo	Sat Sep 25 01:04:38 1999
+++ jitterbug-1.6.2.i18n/source/new_message.c	Tue Oct 10 11:21:03 2000
@@ -51,10 +51,12 @@
 
 	p1 = strstr(mbuf, "\nSubject:");
 
-	if (p1) {
-		p1 += 9;
-		p2 = strchr(p1, '\n');
-		if (p2) *p2 = 0;
+	if (p1) {                          	/* Subject found */
+	  p1 += 9;                   		/* points to next to Subject: */
+	  p2 = strchr(p1, '\n');	        /* to find EOL   */
+	  while ( *(p2+1) == '\t' || *(p2+1) == ' ' ) 
+	    p2 = strchr(p2 +1 , '\n');
+	  if (p2) *p2 = 0;                /* if found, say it is end of string */
 		p1 = strdup(p1);
 		trim_string(p1, " ", " ");
 	}
@@ -80,6 +82,8 @@
 	while ((p1 = strstr(p1, "\nSubject:"))) {
 		p1 += 9;
 		p2 = strchr(p1, '\n');
+		while ( *(p2+1) == '\t' || *(p2+1) == ' ' ) 
+		  p2 = strchr(p2 +1 , '\n');
 		if (!p2) return 0;
 		*p2++ = 0;
 		p3 = p1;
@@ -129,7 +133,9 @@
 	p = (char *)malloc(strlen(subj)+100);
 	if (!p) fatal("out of memory");
 	sprintf(p,"Re: %s (%s%d)", subj, lp_pr_identifier(), id);
-
+#ifdef DEBUG_AUTOREPLY
+	strcpy(from,DEBUG_AUTOREPLY);
+#endif
 	fd = smtp_start_mail(lp_from_address(), from, NULL, NULL, 
 			     p, st.st_size + 1024);