diff --git a/src/lib-sieve/plugins/notify/ext-notify-common.c b/src/lib-sieve/plugins/notify/ext-notify-common.c
index c61e8f73ae3f293da62984b69b24dcde206e10b2..5a36ece391ee70efe3f4eedccdf810321f9e6c7f 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 61a4ea1a9270ed085313fc11d60d9f5235d49981..2728377ddb2a014a69c2d9316a3120e5434deeaa 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) ) {