diff --git a/lam/config/language b/lam/config/language
index 454f422d..546c7688 100644
--- a/lam/config/language
+++ b/lam/config/language
@@ -14,9 +14,12 @@ cs_CZ.utf8:UTF-8:Čeština (Česko)
 # German
 de_DE.utf8:UTF-8:Deutsch (Deutschland)
 
-# English
+# GB English
 en_GB.utf8:UTF-8:English (Great Britain)
 
+# US English
+en_US.utf8:UTF-8:English (USA)
+
 # Spanish
 es_ES.utf8:UTF-8:Español (España)
 
diff --git a/lam/lib/modules/kolabGroup.inc b/lam/lib/modules/kolabGroup.inc
index 5598a011..548f64d0 100644
--- a/lam/lib/modules/kolabGroup.inc
+++ b/lam/lib/modules/kolabGroup.inc
@@ -85,11 +85,11 @@ class kolabGroup extends baseModule {
 				"Text" => _("The list's email address.") . ' ' . _("Multiple values are separated by semicolon.")
 			),
 			'kolabAllowSMTPRecipient' => array (
-				"Headline" => _('Allowed recepients'), 'attr' => 'kolabAllowSMTPRecipient',
+				"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
 				"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
 			),
 			'kolabAllowSMTPRecipientList' => array (
-				"Headline" => _('Allowed recepients'), 'attr' => 'kolabAllowSMTPRecipient',
+				"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
 				"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
 							. ' ' . _("Multiple values are separated by semicolon.")
 			),
@@ -131,7 +131,7 @@ class kolabGroup extends baseModule {
 			),
 			array(
 				'name' => 'kolabGroup_kolabAllowSMTPRecipient',
-				'description' => _('Allowed recepients'),
+				'description' => _('Allowed recipients'),
 				'help' => 'kolabAllowSMTPRecipientList',
 				'example' => '.com; -.net',
 			),
@@ -154,7 +154,7 @@ class kolabGroup extends baseModule {
 		}
 		// available PDF fields
 		$return['PDF_fields'] = array(
-			'kolabAllowSMTPRecipient' => _('Allowed recepients'),
+			'kolabAllowSMTPRecipient' => _('Allowed recipients'),
 			'kolabAllowSMTPSender' => _('Allowed senders'),
 		);
 		if ($this->manageMail()) {
@@ -171,7 +171,7 @@ class kolabGroup extends baseModule {
 		$this->messages['mail'][1] = array('ERROR', _('Account %s:') . ' kolabGroup_mail', _('Please enter a valid email address!'));
 		$this->messages['mail'][2] = array('ERROR', _('Email address'), _('Email address already exists.'));
 		$this->messages['mail'][3] = array('ERROR', _('Account %s:') . ' kolabGroup_mail', _('Email address already exists.'));
-		$this->messages['kolabAllowSMTPRecipient'][0] = array('ERROR', _('Allowed recepients'), _('Please enter a valid recepient expression.'));
+		$this->messages['kolabAllowSMTPRecipient'][0] = array('ERROR', _('Allowed recipients'), _('Please enter a valid recepient expression.'));
 		$this->messages['kolabAllowSMTPRecipient'][1] = array('ERROR', _('Account %s:') . ' kolabGroup_kolabAllowSMTPRecipient', _('Please enter a valid recepient expression.'));
 		$this->messages['kolabAllowSMTPSender'][0] = array('ERROR', _('Allowed senders'), _('Please enter a valid sender expression.'));
 		$this->messages['kolabAllowSMTPSender'][1] = array('ERROR', _('Account %s:') . ' kolabGroup_kolabAllowSMTPSender', _('Please enter a valid sender expression.'));
@@ -194,8 +194,8 @@ class kolabGroup extends baseModule {
 			if ($this->manageMail()) {
 				$this->addSimpleInputTextField($container, 'mail', _('Email address'), true);
 			}
-			// allowed recepients
-			$this->addMultiValueInputTextField($container, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
+			// allowed recipients
+			$this->addMultiValueInputTextField($container, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
 			// allowed senders
 			$this->addMultiValueInputTextField($container, 'kolabAllowSMTPSender', _('Allowed senders'));
 			// delete flag
@@ -261,7 +261,7 @@ class kolabGroup extends baseModule {
 				unset($this->attributes['mail']);
 			}
 		}
-		// allowed recepients
+		// allowed recipients
 		$this->processMultiValueInputTextField('kolabAllowSMTPRecipient', $errors, 'kolabEmailPrefix');
 		// allowed senders
 		$this->processMultiValueInputTextField('kolabAllowSMTPSender', $errors, 'kolabEmailPrefix');
@@ -414,7 +414,7 @@ class kolabGroup extends baseModule {
 	function get_pdfEntries() {
 		$return = array();
 		$this->addSimplePDFField($return, 'mail', _('Email address'));
-		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
+		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
 		$this->addSimplePDFField($return, 'kolabAllowSMTPSender', _('Allowed senders'));
 		return $return;
 	}
diff --git a/lam/lib/modules/kolabSharedFolder.inc b/lam/lib/modules/kolabSharedFolder.inc
index 3424bbf9..adf88f72 100644
--- a/lam/lib/modules/kolabSharedFolder.inc
+++ b/lam/lib/modules/kolabSharedFolder.inc
@@ -110,11 +110,11 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 				"Text" => _("The folder's email address.")
 			),
 			'kolabAllowSMTPRecipient' => array (
-				"Headline" => _('Allowed recepients'), 'attr' => 'kolabAllowSMTPRecipient',
+				"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
 				"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
 			),
 			'kolabAllowSMTPRecipientList' => array (
-				"Headline" => _('Allowed recepients'), 'attr' => 'kolabAllowSMTPRecipient',
+				"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
 				"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
 							. ' ' . _("Multiple values are separated by semicolon.")
 			),
@@ -198,7 +198,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 			),
 			array(
 				'name' => 'kolabSharedFolder_kolabAllowSMTPRecipient',
-				'description' => _('Allowed recepients'),
+				'description' => _('Allowed recipients'),
 				'help' => 'kolabAllowSMTPRecipientList',
 				'example' => '.com; -.net',
 			),
@@ -224,7 +224,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 		// available PDF fields
 		$return['PDF_fields'] = array(
 			'cn' => _('Name'),
-			'kolabAllowSMTPRecipient' => _('Allowed recepients'),
+			'kolabAllowSMTPRecipient' => _('Allowed recipients'),
 			'kolabAllowSMTPSender' => _('Allowed senders'),
 			'aliases' => _('Email aliases'),
 			'delegate' => _('Delegates'),
@@ -240,7 +240,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 	* This function fills the $messages variable with output messages from this module.
 	*/
 	function load_Messages() {
-		$this->messages['kolabAllowSMTPRecipient'][0] = array('ERROR', _('Allowed recepients'), _('Please enter a valid recepient expression.'));
+		$this->messages['kolabAllowSMTPRecipient'][0] = array('ERROR', _('Allowed recipients'), _('Please enter a valid recepient expression.'));
 		$this->messages['kolabAllowSMTPRecipient'][1] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_kolabAllowSMTPRecipient', _('Please enter a valid recepient expression.'));
 		$this->messages['kolabAllowSMTPSender'][0] = array('ERROR', _('Allowed senders'), _('Please enter a valid sender expression.'));
 		$this->messages['kolabAllowSMTPSender'][1] = array('ERROR', _('Account %s:') . ' kolabSharedFolder_kolabAllowSMTPSender', _('Please enter a valid sender expression.'));
@@ -297,8 +297,8 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 		$typeSelect->setHasDescriptiveElements(true);
 		$baseContainer->addElement($typeSelect, true);
 		$baseContainer->addVerticalSpace('10px');
-		// allowed recepients
-		$this->addMultiValueInputTextField($baseContainer, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
+		// allowed recipients
+		$this->addMultiValueInputTextField($baseContainer, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
 		// allowed senders
 		$this->addMultiValueInputTextField($baseContainer, 'kolabAllowSMTPSender', _('Allowed senders'));
 		$container->addElement($baseContainer, true);
@@ -384,7 +384,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 		}
 		// folder type
 		$this->attributes['kolabFolderType'][0] = $_POST['kolabFolderType'];
-		// allowed recepients
+		// allowed recipients
 		$this->processMultiValueInputTextField('kolabAllowSMTPRecipient', $errors, 'kolabEmailPrefix');
 		// allowed senders
 		$this->processMultiValueInputTextField('kolabAllowSMTPSender', $errors, 'kolabEmailPrefix');
@@ -566,7 +566,7 @@ class kolabSharedFolder extends baseModule { // TODO folder type
 		$this->addSimplePDFField($return, 'mail', _('Email address'));
 		$this->addSimplePDFField($return, 'mailHost', _('Mailbox home server'));
 		$this->addSimplePDFField($return, 'kolabTargetFolder', _('Target IMAP folder'));
-		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
+		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
 		$this->addSimplePDFField($return, 'kolabAllowSMTPSender', _('Allowed senders'));
 		$this->addSimplePDFField($return, 'aliases', _('Email aliases'), 'alias');
 		$this->addSimplePDFField($return, 'delegate', _('Delegates'), 'kolabDelegate');
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index 5f06856e..98868b54 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -141,11 +141,11 @@ class kolabUser extends baseModule {
 				"Text" => _("The name of the server where the mailbox is located.")
 			),
 			'kolabAllowSMTPRecipient' => array (
-				"Headline" => _('Allowed recepients'), 'attr' => 'kolabAllowSMTPRecipient',
+				"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
 				"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
 			),
 			'kolabAllowSMTPRecipientList' => array (
-				"Headline" => _('Allowed recepients'), 'attr' => 'kolabAllowSMTPRecipient',
+				"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
 				"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
 							. ' ' . _("Multiple values are separated by semicolon.")
 			),
@@ -196,7 +196,7 @@ class kolabUser extends baseModule {
 			),
 			array(
 				'name' => 'kolabUser_kolabAllowSMTPRecipient',
-				'description' => _('Allowed recepients'),
+				'description' => _('Allowed recipients'),
 				'help' => 'kolabAllowSMTPRecipientList',
 				'example' => '.com; -.net',
 			),
@@ -213,7 +213,7 @@ class kolabUser extends baseModule {
 			'mailHost' => _('Mailbox home server'),
 			'aliases' => _('Email aliases'),
 			'delegate' => _('Delegates'),
-			'kolabAllowSMTPRecipient' => _('Allowed recepients'),
+			'kolabAllowSMTPRecipient' => _('Allowed recipients'),
 			'kolabAllowSMTPSender' => _('Allowed senders'),
 		);
 		return $return;
@@ -231,7 +231,7 @@ class kolabUser extends baseModule {
 		$this->messages['mailHost'][1] = array('ERROR', _('Account %s:') . ' kolabUser_mailHost', _('Mailbox home server name is invalid!'));
 		$this->messages['mailHost'][2] = array('ERROR', _('Mailbox home server name is empty!'));
 		$this->messages['delegate'][0] = array('ERROR', _('Account %s:') . ' kolabUser_delegates', _('Unknown delegate address: %s'));
-		$this->messages['kolabAllowSMTPRecipient'][0] = array('ERROR', _('Allowed recepients'), _('Please enter a valid recepient expression.'));
+		$this->messages['kolabAllowSMTPRecipient'][0] = array('ERROR', _('Allowed recipients'), _('Please enter a valid recepient expression.'));
 		$this->messages['kolabAllowSMTPRecipient'][1] = array('ERROR', _('Account %s:') . ' kolabUser_kolabAllowSMTPRecipient', _('Please enter a valid recepient expression.'));
 		$this->messages['kolabAllowSMTPSender'][0] = array('ERROR', _('Allowed senders'), _('Please enter a valid sender expression.'));
 		$this->messages['kolabAllowSMTPSender'][1] = array('ERROR', _('Account %s:') . ' kolabUser_kolabAllowSMTPSender', _('Please enter a valid sender expression.'));
@@ -346,8 +346,8 @@ class kolabUser extends baseModule {
 			}
 			$return->addElement($delegatesContainer, true);
 			$return->addElement(new htmlSubTitle(_('Options')), true);
-			// allowed recepients
-			$this->addMultiValueInputTextField($return, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
+			// allowed recipients
+			$this->addMultiValueInputTextField($return, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
 			// allowed senders
 			$this->addMultiValueInputTextField($return, 'kolabAllowSMTPSender', _('Allowed senders'));
 			// delete flag
@@ -453,7 +453,7 @@ class kolabUser extends baseModule {
 				$this->attributes['kolabDelegate'][] = $_POST['delegate'];
 			}
 			$this->attributes['kolabDelegate'] = array_unique($this->attributes['kolabDelegate']);
-			// allowed recepients
+			// allowed recipients
 			$this->processMultiValueInputTextField('kolabAllowSMTPRecipient', $errors, 'kolabEmailPrefix');
 			// allowed senders
 			$this->processMultiValueInputTextField('kolabAllowSMTPSender', $errors, 'kolabEmailPrefix');
@@ -698,7 +698,7 @@ class kolabUser extends baseModule {
 		}
 		$this->addSimplePDFField($return, 'aliases', _('Email aliases'), 'alias');
 		$this->addSimplePDFField($return, 'delegate', _('Delegates'), 'kolabDelegate');
-		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recepients'));
+		$this->addSimplePDFField($return, 'kolabAllowSMTPRecipient', _('Allowed recipients'));
 		$this->addSimplePDFField($return, 'kolabAllowSMTPSender', _('Allowed senders'));
 		return $return;
 	}
diff --git a/lam/lib/modules/pykotaBillingCode.inc b/lam/lib/modules/pykotaBillingCode.inc
index 2148b996..a1ee2cd5 100644
--- a/lam/lib/modules/pykotaBillingCode.inc
+++ b/lam/lib/modules/pykotaBillingCode.inc
@@ -131,7 +131,7 @@ class pykotaBillingCode extends baseModule {
 	function display_html_attributes() {
 		$container = new htmlTable();
 		// pykotaBillingCode
-		$this->addSimpleInputTextField($container, 'pykotaBillingCode', _('BillingCode'), true);
+		$this->addSimpleInputTextField($container, 'pykotaBillingCode', _('Billing code'), true);
 		// balance
 		$container->addElement(new htmlOutputText(_('Balance')));
 		$pykotaBalance = '';
diff --git a/lam/po/make_po_en_US b/lam/po/make_po_en_US
new file mode 100755
index 00000000..9d5e2f33
--- /dev/null
+++ b/lam/po/make_po_en_US
@@ -0,0 +1,13 @@
+#!/bin/bash
+# $Id: make_po_it 5135 2013-11-29 19:47:29Z gruberroland $
+#
+# Copyright (C) 2013  Roland Gruber
+# This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
+
+# This script is run after make_po to merge the existing US English translations to messages.po
+
+./make_po
+msgen messages.po | msgattrib --set-fuzzy -o messages2.po
+rm messages.po
+mv messages2.po messages.po
+msgmerge -v ../locale/en_US/LC_MESSAGES/messages.po messages.po -o messages.po
\ No newline at end of file