2005-04-12

	* src/compose.c: compose_write_to_file(): don't encode clearsigned
	  text.

Index: src/compose.c
===================================================================
RCS file: /cvsroot/sylpheed/sylpheed/src/compose.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- src/compose.c	4 Mar 2005 07:45:54 -0000	1.272
+++ src/compose.c	12 Apr 2005 08:58:06 -0000	1.273
@@ -2701,7 +2701,7 @@ static gint compose_write_to_file(Compos
 
 #if USE_GPGME
 	/* force encoding to protect trailing spaces */
-	if (!is_draft && compose->use_signing) {
+	if (!is_draft && compose->use_signing && !compose->account->clearsign) {
 		if (encoding == ENC_7BIT)
 			encoding = ENC_QUOTED_PRINTABLE;
 		else if (encoding == ENC_8BIT)
@@ -2709,6 +2709,10 @@ static gint compose_write_to_file(Compos
 	}
 
 	if (!is_draft && compose->use_signing && compose->account->clearsign) {
+		/* MIME encoding doesn't fit with cleartext signature */
+		if (encoding == ENC_QUOTED_PRINTABLE || encoding == ENC_BASE64)
+			encoding = ENC_8BIT;
+
 		if (compose_clearsign_text(compose, &buf) < 0) {
 			g_warning("clearsign failed\n");
 			fclose(fp);