diff --git a/Makefile b/Makefile
index 2b12c7027b90ede1a30510ca3fda74004df270b0..24c457750db7aafdf9cef83be86af2bfd4b15398 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BASE=rules_shipping
 BASE_ADV=rules_shipping_advanced
 PLUGINTYPE=vmshipment
 ZIPBASE=opentools_vm
-VERSION=6.2
+VERSION=6.2.1
 
 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE).script.php $(BASE).xml index.html
 PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
diff --git a/library/rules_shipping_framework.php b/library/rules_shipping_framework.php
index f3d42dd0fa9e6e4f0f6bb65b7b1f2eb6f6f1dc80..792e691d2c7ab0f6f52e683458d248829f18afae 100644
--- a/library/rules_shipping_framework.php
+++ b/library/rules_shipping_framework.php
@@ -653,7 +653,7 @@ class ShippingRule {
 	var $countries = array();
 	var $ruleinfo = 0;
 	var $includes_tax = 0;
-	var $messages = array('error' => array(), 'warning' => array(), 'notice' => array(), 'debug' => array());
+	var $messages = array('error' => array(), 'warning' => array(), 'message' => array(), 'notice' => array(), 'debug' => array());
 	
 	function __construct ($framework, $rule, $countries, $ruleinfo) {
 		$this->framework = $framework;
@@ -687,8 +687,8 @@ class ShippingRule {
 			case 'comment':         break; // Completely ignore all comments!
 			case 'error':			$this->messages['error'][] = $value; break;
 			case 'warning':			$this->messages['warning'][] = $value; break;
-			case 'notice':
-			case 'message':			$this->messages['notice'][] = $value; break;
+			case 'notice':			$this->messages['notice'][] = $value; break;
+			case 'message':			$this->messages['message'][] = $value; break;
 			case 'debug':			$this->messages['debug'][] = $value; break;
 			case 'condition':       $this->conditions[] = $value; break;
 			default:                $this->framework->warning('OTSHIPMENT_RULES_UNKNOWN_VARIABLE', $var, $rulepart);
@@ -1136,7 +1136,8 @@ class ShippingRule {
 		$this->match = True;
 		foreach ($this->messages as $k=>$msgs) {
 			foreach ($msgs as $i=>$m) {
-				$this->messages[$k][$i] = $this->stringReplaceVariables($m, $vals);
+				// First translate the messge before replacing variables!
+				$this->messages[$k][$i] = $this->stringReplaceVariables($this->framework->__($m), $vals);
 			}
 		}
 		// Calculate the value (i.e. shipping cost or modifier)
diff --git a/releases/plg_opentools_vm_rules_shipping_advanced_v6.2.1.zip b/releases/plg_opentools_vm_rules_shipping_advanced_v6.2.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..eb90f3b94b99b11d849f03f8888e090a517a11aa
Binary files /dev/null and b/releases/plg_opentools_vm_rules_shipping_advanced_v6.2.1.zip differ
diff --git a/releases/plg_opentools_vm_rules_shipping_v6.2.1.zip b/releases/plg_opentools_vm_rules_shipping_v6.2.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..52572253a55ddc969c4da55667221c2ec4ffc27b
Binary files /dev/null and b/releases/plg_opentools_vm_rules_shipping_v6.2.1.zip differ
diff --git a/rules_shipping.xml b/rules_shipping.xml
index 90eb54301ebfa235d624a422e7db14d719b9f8d0..a0e6bb7e43ab13bc1ec711c147663ad8cf71bcbb 100644
--- a/rules_shipping.xml
+++ b/rules_shipping.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.open-tools.net</authorUrl>
     <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>6.2</version>
+    <version>6.2.1</version>
     <description>OTSHIPMENT_RULES_DESC</description>
     <files>
         <filename plugin="rules_shipping">rules_shipping.php</filename>
diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml
index 98fe4c5190e838607537923511682ff600d131ba..a42f24c02c0bb01e8df2c8df9fd376048ae447dc 100644
--- a/rules_shipping_advanced.xml
+++ b/rules_shipping_advanced.xml
@@ -6,7 +6,7 @@
     <authorUrl>http://www.open-tools.net</authorUrl>
     <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright>
     <license>GPL v3+</license>
-    <version>6.2</version>
+    <version>6.2.1</version>
     <description>OTSHIPMENT_RULES_ADV_DESC</description>
     <files>
         <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>