X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fprocheader.c;h=1adc3ef07d8f99dfc6641094f705a05bbbd70373;hp=4d543b60dd4437ddfc46dbfd51266c79cd369140;hb=0e498c48f06536e15be6e2a578343d1c39b1cc7b;hpb=113d4ee109e5ef847816f79c9693a58d5dbbc136

diff --git a/src/procheader.c b/src/procheader.c
index 4d543b60d..1adc3ef07 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -134,8 +134,9 @@ static gint generic_get_one_field(gchar *buf, gint len, void *data,
 			if ((len - buflen) > 2) {
 				if (getline(buf + buflen, len - buflen, data) == NULL)
 					break;
-
-				if (hp && hp->unfold)
+				/* trim trailing \n if requesting one header or
+				 * unfolding was requested */
+				if (!hentry || (hp && hp->unfold))
 				    strretchomp(buf);
 			} else
 				break;