diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index a33e39d6a0..53b9961bab 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -144,22 +144,22 @@
 				'username'  => $fname.' '.$lname,
 				'firstname' => $fname,
 				'lastname'  => $lname,
-				'maildomain'=> $GLOBALS['phpgw_info']['server']['mail_suffix'],
+				'domain'    => $GLOBALS['phpgw_info']['server']['mail_suffix'],
 				'email'     => $this->email_address($this->account_id),
 				'date'      => $GLOBALS['phpgw']->common->show_date('',$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
 			);
-			$this->vars = array(	// langs have to be in common !!!
-				'username'  => lang('name of the user, eg. "%1"',$this->values['username']),
-				'firstname' => lang('first name of the user, eg. "%1"',$this->values['firstname']),
-				'lastname'  => lang('last name of the user, eg. "%1"',$this->values['lastname']),
-				'maildomain'=> lang('mail domain, eg. "%1"',$this->values['maildomain']),
-				'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
-				'date'      => lang('todays date, eg. "%1"',$this->values['date']),
-			);
 			// do this first, as it might be already contain some substitues
 			//
 			$this->values['email'] = $this->parse_notify($this->values['email']);
 
+			$this->vars = array(	// langs have to be in common !!!
+				'username'  => lang('name of the user, eg. "%1"',$this->values['username']),
+				'firstname' => lang('first name of the user, eg. "%1"',$this->values['firstname']),
+				'lastname'  => lang('last name of the user, eg. "%1"',$this->values['lastname']),
+				'domain'    => lang('domain name for mail-address, eg. "%1"',$this->values['domain']),
+				'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
+				'date'      => lang('todays date, eg. "%1"',$this->values['date']),
+			);
 			// do the substituetion in the effective prefs (data)
 			//
 			foreach($this->data as $app => $data)
diff --git a/phpgwapi/setup/phpgw_de.lang b/phpgwapi/setup/phpgw_de.lang
index 50809d3d21..3d707b8712 100644
--- a/phpgwapi/setup/phpgw_de.lang
+++ b/phpgwapi/setup/phpgw_de.lang
@@ -113,6 +113,7 @@ do you want to move all subcategories one level down ?	common	de	Möchten Si
 djibouti	common	de	DJIBOUTI
 do you also want to delete all subcategories ?	common	de	Sollen alle Unterkategorien gelöscht werden ?
 domain	common	de	Domain
+domain name for mail-address, eg. "%1"	common	de	Domainname für E-Mail Adresse, zB. "%1"
 domestic	common	de	Inland
 dominica	common	de	DOMINICA
 dominican republic	common	de	DOMÄNIKANISCHE REPUBLIK
@@ -250,7 +251,6 @@ luxembourg	common	de	LUXEMBURG
 macau	common	de	MACAU
 macedonia, the former yugoslav republic of	common	de	MAZEDONIEN, FRÜHERE JUGOSLAVISCHE REPUBLIK
 madagascar	common	de	MADAGASCAR
-mail domain, eg. "%1"	common	de	Mail Domain, zB. "%1"
 main category	common	de	Hauptkategorie
 main screen	common	de	Startseite
 maintainer	about	de	Maintainer
diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang
index 56d7884952..9f2e33c236 100644
--- a/phpgwapi/setup/phpgw_en.lang
+++ b/phpgwapi/setup/phpgw_en.lang
@@ -115,6 +115,7 @@ do you want to delete all subcategories ?	common	en	Do you want to delete all su
 do you want to move all subcategories one level down ?	common	en	Do you want to move all subcategories one level down ?
 do you also want to delete all subcategories ?	common	en	Do you also want to delete all subcategories ?
 domain	common	en	Domain
+domain name for mail-address, eg. "%1"	common	en	domain name for mail-address, eg. "%1"
 domestic	common	en	Domestic
 dominica	common	en	DOMINICA
 dominican republic	common	en	DOMINICAN REPUBLIC
@@ -233,7 +234,6 @@ last name	common	en	Last name
 last page	common	en	Last page
 last name of the user, eg. "%1"	common	en	last name of the user, eg. "%1"
 last page	common	en	Last page
->>>>>>> 1.38.2.14.2.5
 lastname	common	en	Lastname
 latvia	common	en	LATVIA
 lebanon	common	en	LEBANON
@@ -253,7 +253,6 @@ luxembourg	common	en	LUXEMBOURG
 macau	common	en	MACAU
 macedonia, the former yugoslav republic of	common	en	MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF
 madagascar	common	en	MADAGASCAR
-mail domain, eg. "%1"	common	en	mail domain, eg. "%1"
 main category	common	en	Main category
 main screen	common	en	Main screen
 maintainer	about	en	Maintainer