From adc6c8cebe7c29536dc43e18f4dc02c550172f53 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sat, 1 Jan 2011 15:21:44 +0100
Subject: [PATCH] Removed header MIME-decoding for other instances where
 addresses need to be parsed.

---
 src/lib-sieve/plugins/notify/ext-notify-common.c | 2 +-
 src/lib-sieve/plugins/vacation/cmd-vacation.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib-sieve/plugins/notify/ext-notify-common.c b/src/lib-sieve/plugins/notify/ext-notify-common.c
index c61e8f73a..5a36ece39 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-common.c
+++ b/src/lib-sieve/plugins/notify/ext-notify-common.c
@@ -245,7 +245,7 @@ void ext_notify_construct_message
 			p += 6;
 		
 			/* Fetch sender from oriinal message */
-			if ( mail_get_headers_utf8(msgdata->mail, "from", &header) >= 0 )
+			if ( mail_get_headers(msgdata->mail, "from", &header) >= 0 )
 				 str_append(out_msg, header[0]); 
 
 		} else if ( strncasecmp(p, "$env-from$", 10) == 0 ) {
diff --git a/src/lib-sieve/plugins/vacation/cmd-vacation.c b/src/lib-sieve/plugins/vacation/cmd-vacation.c
index 61a4ea1a9..2728377dd 100644
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c
@@ -1074,7 +1074,7 @@ static bool act_vacation_commit
 	 */
 	hdsp = _my_address_headers;
 	while ( *hdsp != NULL ) {
-		if ( mail_get_headers_utf8
+		if ( mail_get_headers
 			(msgdata->mail, *hdsp, &headers) >= 0 && headers[0] != NULL ) {	
 			
 			if ( _contains_my_address(headers, recipient) ) {
-- 
GitLab