454a455,457
> 	/* remove any signature */
> 	pan_remove_signature (reply_portion);
> 	
458,459d460
< 		if (!marked && line_len>=3 && (!strncmp(line,"-- ",3) || !strncmp(line,"-- \r",4)))
< 			break;
1378,1388c1379
< 	if (!strncmp (text, "-- \r\n", 5) ||
< 	    !strncmp (text, "-- \n", 4))
< 		index = text;
< 	else
< 	{
< 		index = pan_strstr (text, "\n-- \n");
< 		if (index == NULL)
< 			index = pan_strstr (text, "\n-- \r"); 
< 	}	
< 
< 	if (index)
---
> 	if (pan_remove_signature (text))
1390d1380
< 		*index = 0;