diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf
index 7b705b73..a7311333 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf
index 54a77770..b233f0ba 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf
index 793f7f19..17ee0c97 100644
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf
@@ -87,7 +87,7 @@ command_directory = /usr/local/sbin
 daemon_directory = /usr/local/libexec/postfix
 data_directory = /var/db/postfix
 mail_owner = postfix
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 mydomain = <SERVERNAME>
 myorigin = $mydomain
 
diff --git a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf
index fb6b40d7..44d0e452 100644
--- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf
+++ b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf
@@ -34,7 +34,8 @@ transport_maps = hash:/etc/postfix/transport
 sender_canonical_maps = hash:/etc/postfix/sender_canonical
 masquerade_exceptions = root
 masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+mydomain = <SERVERNAME>
+myhostname = mail.$mydomain
 program_directory = /usr/lib/postfix
 masquerade_domains =
 mydestination = $myhostname $mydomain localhost localhost.$mydomain
diff --git a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf
index d37df390..68e02697 100644
--- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf
@@ -1,7 +1,9 @@
 ## General Postfix configuration
 
+mydomain = <SERVERNAME>
+
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf
index fb580f52..8aa0fb3a 100644
--- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf
+++ b/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf
@@ -35,7 +35,7 @@ transport_maps = hash:/etc/postfix/transport
 sender_canonical_maps = hash:/etc/postfix/sender_canonical
 masquerade_exceptions = root
 masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 mydomain = <SERVERNAME>
 program_directory = /usr/lib/postfix
 masquerade_domains =
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
index d2379921..94b922dc 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
index 2f1d1cf5..9c41e52b 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf
index 7b705b73..a7311333 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf
index a7ec7a8e..e8d6c20a 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf
index 7b705b73..a7311333 100644
--- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,
diff --git a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf
index 8ef6af9d..86bf0608 100644
--- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,