diff --git a/templates/Template App Postfix.xml b/templates/Template App Postfix.xml
index e0c977adf5dbb5a009ac878f441c88eec2f73380..21d5ba139c53bcd43e24e1248c561994083648c5 100644
--- a/templates/Template App Postfix.xml	
+++ b/templates/Template App Postfix.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:28:44Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T07:35:49Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -24,15 +24,15 @@
             </applications>
             <items>
                 <item>
-                    <name>Number of mails in queue - active</name>
+                    <name>Postfix is enabled in autostart</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mailqueue-postfix-queue[active]</key>
-                    <delay>60</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>chkconfig[postfix]</key>
+                    <delay>1800</delay>
+                    <history>7</history>
+                    <trends>30</trends>
                     <status>0</status>
                     <value_type>3</value_type>
                     <allowed_hosts/>
@@ -49,7 +49,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -67,12 +67,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Number of mails in queue - deferred</name>
+                    <name>Number of mails in queue - active</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mailqueue-postfix-queue[deferred]</key>
+                    <key>mailqueue-postfix-queue[active]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -110,15 +110,15 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Postfix is enabled in autostart</name>
+                    <name>Number of mails in queue - deferred</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>chkconfig[postfix]</key>
-                    <delay>1800</delay>
-                    <history>7</history>
-                    <trends>30</trends>
+                    <key>mailqueue-postfix-queue[deferred]</key>
+                    <delay>60</delay>
+                    <history>30</history>
+                    <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
                     <allowed_hosts/>
@@ -135,7 +135,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -153,17 +153,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Postfix version</name>
+                    <name>SMTP service is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>postfix.version</key>
-                    <delay>3600</delay>
-                    <history>30</history>
+                    <key>net.tcp.service[smtp]</key>
+                    <delay>90</delay>
+                    <history>7</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>1</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -192,21 +192,23 @@
                             <name>Postfix</name>
                         </application>
                     </applications>
-                    <valuemap/>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>SMTP service is running</name>
+                    <name>Postfix version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.service[smtp]</key>
-                    <delay>90</delay>
-                    <history>7</history>
-                    <trends>365</trends>
+                    <key>postfix.version</key>
+                    <delay>3600</delay>
+                    <history>30</history>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>1</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -235,9 +237,7 @@
                             <name>Postfix</name>
                         </application>
                     </applications>
-                    <valuemap>
-                        <name>Service state</name>
-                    </valuemap>
+                    <valuemap/>
                     <logtimefmt/>
                 </item>
             </items>
@@ -355,4 +355,19 @@
             </graph_items>
         </graph>
     </graphs>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>