diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index 2bdb8c422921b5097103f7e2eb878a70427dea5c..db75f133bde2a36cf72b30441a71243cdc314b5f 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -48,7 +48,7 @@ void sieve_verror
 		const char *fmt, va_list args)
 {
 	if ( ehandler->log_master )
-		i_error("%s: %s", location, t_strdup_vprintf(fmt, args));
+		i_error("sieve: %s: %s", location, t_strdup_vprintf(fmt, args));
 
 	ehandler->verror(ehandler, location, fmt, args);
 	ehandler->errors++;
@@ -59,7 +59,7 @@ void sieve_vwarning
 		const char *fmt, va_list args)
 {
 	if ( ehandler->log_master )
-		i_warning("%s: %s", location, t_strdup_vprintf(fmt, args));
+		i_warning("sieve: %s: %s", location, t_strdup_vprintf(fmt, args));
 		
 	ehandler->vwarning(ehandler, location, fmt, args);
 	ehandler->warnings++;
@@ -70,7 +70,7 @@ void sieve_vinfo
 		const char *fmt, va_list args)
 {
 	if ( ehandler->log_master )
-		i_info("%s: %s", location, t_strdup_vprintf(fmt, args));
+		i_info("sieve: %s: %s", location, t_strdup_vprintf(fmt, args));
 	
 	if ( ehandler->log_info )	
 		ehandler->vinfo(ehandler, location, fmt, args);
diff --git a/src/lib-sieve/sieve-interpreter.c b/src/lib-sieve/sieve-interpreter.c
index 338ccbe2584069f496b4f9f307cf8b23e2ad0a7f..18cfe5ba9de866b877b6c3b83820923b7ab5a3a4 100644
--- a/src/lib-sieve/sieve-interpreter.c
+++ b/src/lib-sieve/sieve-interpreter.c
@@ -109,7 +109,7 @@ void sieve_runtime_error
 	va_list args;
 	
 	va_start(args, fmt);
-	sieve_vinfo(runenv->interp->ehandler, _get_location(runenv), fmt, args); 
+	sieve_verror(runenv->interp->ehandler, _get_location(runenv), fmt, args); 
 	va_end(args);
 }