From 7b5e56388e5628766db68f4b3a1ff6e3bf34dc93 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Tue, 19 Sep 2006 07:53:00 +0000
Subject: improved PGP/MIME compatibility.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1169 ee746299-78ed-0310-b773-934348b2243d
---
 src/compose.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/compose.c')

diff --git a/src/compose.c b/src/compose.c
index a3ca459e..78cd461d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2976,13 +2976,19 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
 	buf = canon_buf;
 
 #if USE_GPGME
-	/* force encoding to protect trailing spaces */
+	/* chomp all trailing spaces */
 	if (rfc2015_is_available() && !is_draft &&
 	    compose->use_signing && !compose->account->clearsign) {
+		gchar *tmp;
+		tmp = strchomp_all(buf);
+		g_free(buf);
+		buf = tmp;
+#if 0
 		if (encoding == ENC_7BIT)
 			encoding = ENC_QUOTED_PRINTABLE;
 		else if (encoding == ENC_8BIT)
 			encoding = ENC_BASE64;
+#endif
 	}
 
 	if (rfc2015_is_available() && !is_draft &&
-- 
cgit v1.2.3