Index: src/zabbix_server/escalator/escalator.c
===================================================================
--- src/zabbix_server/escalator/escalator.c	(revision 22993)
+++ src/zabbix_server/escalator/escalator.c	(working copy)
@@ -558,11 +558,6 @@
 		{
 			zabbix_log(LOG_LEVEL_DEBUG, "Conditions match our event. Execute operation.");
 
-			substitute_simple_macros(event, NULL, NULL, NULL, NULL, &operation.shortdata,
-					MACRO_TYPE_MESSAGE, NULL, 0);
-			substitute_simple_macros(event, NULL, NULL, NULL, NULL, &operation.longdata,
-					MACRO_TYPE_MESSAGE, NULL, 0);
-
 			if (0 == esc_period || esc_period > operation.esc_period)
 				esc_period = operation.esc_period;
 
@@ -571,6 +566,10 @@
 				case OPERATION_TYPE_MESSAGE:
 					if (0 == operation.default_msg)
 					{
+						substitute_simple_macros(event, NULL, NULL, NULL, NULL, &operation.shortdata,
+								MACRO_TYPE_MESSAGE, NULL, 0);
+						substitute_simple_macros(event, NULL, NULL, NULL, NULL, &operation.longdata,
+								MACRO_TYPE_MESSAGE, NULL, 0);
 						shortdata = operation.shortdata;
 						longdata = operation.longdata;
 					}
@@ -583,6 +582,8 @@
 					add_object_msg(event->source, escalation->triggerid, &operation, &user_msg, shortdata, longdata);
 					break;
 				case OPERATION_TYPE_COMMAND:
+					substitute_simple_macros(event, NULL, NULL, NULL, NULL, &operation.longdata,
+							MACRO_TYPE_MESSAGE, NULL, 0);
 					add_command_alert(escalation, event, action, operation.longdata);
 					break;
 				default: