diff --git a/src/lib-sieve/cmd-redirect.c b/src/lib-sieve/cmd-redirect.c
index ae5c28934089e328731443beba4171e6fee62779..c90d5f8391cb54bec2292dd88d12e0ba7d6d95eb 100644
--- a/src/lib-sieve/cmd-redirect.c
+++ b/src/lib-sieve/cmd-redirect.c
@@ -357,17 +357,17 @@ static int act_redirect_send
 	/* Close SMTP transport */
 	if ( (ret=sieve_smtp_finish(sctx, &error)) <= 0 ) {
 		if ( ret < 0 ) {
-			sieve_result_global_log_error(aenv,
-				"failed to redirect message to <%s>: %s "
-				"(temporary failure)",
-				str_sanitize(ctx->to_address, 256), str_sanitize(error, 512));
-		} else {
 			sieve_result_global_error(aenv,
 				"failed to redirect message to <%s>: %s "
-				"(permanent failure)",
+				"(temporary failure)",
 				str_sanitize(ctx->to_address, 256), str_sanitize(error, 512));
-
+			return SIEVE_EXEC_TEMP_FAILURE;
 		}
+
+		sieve_result_global_log_error(aenv,
+			"failed to redirect message to <%s>: %s "
+			"(permanent failure)",
+			str_sanitize(ctx->to_address, 256), str_sanitize(error, 512));
 		return SIEVE_EXEC_FAILURE;
 	}
 
diff --git a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
index 1272ee7e35b981f057feacf586edb9e346915319..d38e867ddcb86d214899aac8385f297169b7540a 100644
--- a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
@@ -555,11 +555,11 @@ static bool ntfy_mailto_send
 
 	if ( (ret=sieve_smtp_finish(sctx, &error)) <= 0 ) {
 		if (ret < 0)  {
-			sieve_enotify_global_log_error(nenv,
+			sieve_enotify_global_error(nenv,
 				"failed to send mail notification to %s: %s (temporary failure)",
 				str_c(all),	str_sanitize(error, 512));
 		} else {
-			sieve_enotify_global_error(nenv,
+			sieve_enotify_global_log_error(nenv,
 				"failed to send mail notification to %s: %s (permanent failure)",
 				str_c(all),	str_sanitize(error, 512));
 		}
diff --git a/src/lib-sieve/plugins/notify/cmd-notify.c b/src/lib-sieve/plugins/notify/cmd-notify.c
index 5f368cbec157d7cce3fcfa9b5f4304a84a3a05d7..fb632f930a5ea4c4062224f4e6b24e0cc73448bb 100644
--- a/src/lib-sieve/plugins/notify/cmd-notify.c
+++ b/src/lib-sieve/plugins/notify/cmd-notify.c
@@ -784,11 +784,11 @@ static bool act_notify_send
 
 	if ( (ret=sieve_smtp_finish(sctx, &error)) <= 0 ) {
 		if (ret < 0) {
-			sieve_result_global_log_error(aenv,
+			sieve_result_global_error(aenv,
 				"failed to send mail notification to %s: %s (temporary failure)",
 				str_c(all),	str_sanitize(error, 512));
 		} else {
-			sieve_result_global_error(aenv,
+			sieve_result_global_log_error(aenv,
 				"failed to send mail notification to %s: %s (permanent failure)",
 				str_c(all),	str_sanitize(error, 512));
 		}
diff --git a/src/lib-sieve/plugins/vacation/cmd-vacation.c b/src/lib-sieve/plugins/vacation/cmd-vacation.c
index 1b026e811b8a9888f5a67e2e03bfacf8f18e1ec9..04b4958a5b139ad96fcb084c0eda10b6092d1e86 100644
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c
@@ -992,11 +992,11 @@ static bool act_vacation_send
 	/* Close smtp session */
 	if ( (ret=sieve_smtp_finish(sctx, &error)) <= 0 ) {
 		if ( ret < 0 ) {
-			sieve_result_global_log_error(aenv,
+			sieve_result_global_error(aenv,
 				"failed to send vacation response to <%s>: %s (temporary error)",
 				str_sanitize(reply_to, 256), str_sanitize(error, 512));
 		} else {
-			sieve_result_global_error(aenv,
+			sieve_result_global_log_error(aenv,
 				"failed to send vacation response to <%s>: %s (permanent error)",
 				str_sanitize(reply_to, 256), str_sanitize(error, 512));
 		}
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 91ccec0030bd4aa4174608f5d7862ac6bca785dd..33f7aaf20f4d54d160e161009afec2cf1551aa03 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -873,12 +873,12 @@ static bool sieve_action_do_reject_mail
 
 	if ( (ret=sieve_smtp_finish(sctx, &error)) <= 0 ) {
 		if ( ret < 0 ) {
-			sieve_result_global_log_error(aenv,
+			sieve_result_global_error(aenv,
 				"failed to send rejection message to <%s>: %s "
 				"(temporary failure)",
 				str_sanitize(sender, 256), str_sanitize(error, 512));
 		} else {
-			sieve_result_global_error(aenv,
+			sieve_result_global_log_error(aenv,
 				"failed to send rejection message to <%s>: %s "
 				"(permanent failure)",
 				str_sanitize(sender, 256), str_sanitize(error, 512));