From fc162164725588cf75969f707faead9c9cd8e68b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 28 Jun 2010 09:20:13 +0000
Subject: [PATCH] Next wave of lesser getMessage()

---
 inc/autopurge/purge-inact.php               |  4 +--
 inc/extensions-functions.php                |  6 ++---
 inc/extensions/ext-rewrite.php              |  8 +++---
 inc/filters.php                             |  2 +-
 inc/functions.php                           |  4 +--
 inc/install-inc.php                         |  8 +++---
 inc/libs/admins_functions.php               |  4 +--
 inc/libs/autopurge_functions.php            |  2 +-
 inc/libs/holiday_functions.php              |  2 +-
 inc/libs/network_functions.php              | 30 ++++++++++-----------
 inc/libs/refback_functions.php              |  2 +-
 inc/libs/register_functions.php             |  2 +-
 inc/libs/sponsor_functions.php              |  6 ++---
 inc/libs/surfbar_functions.php              |  2 +-
 inc/libs/user_functions.php                 | 14 +++++-----
 inc/libs/wernis_functions.php               | 14 +++++-----
 inc/mails/doubler_mails.php                 |  2 +-
 inc/modules/admin.php                       |  2 +-
 inc/modules/admin/action-admins.php         |  4 +--
 inc/modules/admin/action-bank.php           |  2 +-
 inc/modules/admin/action-country.php        |  2 +-
 inc/modules/admin/action-doubler.php        |  2 +-
 inc/modules/admin/action-email.php          |  2 +-
 inc/modules/admin/action-holiday.php        |  2 +-
 inc/modules/admin/action-login.php          |  2 +-
 inc/modules/admin/action-menu.php           |  2 +-
 inc/modules/admin/action-misc.php           |  2 +-
 inc/modules/admin/action-mods.php           |  2 +-
 inc/modules/admin/action-newsletter.php     |  2 +-
 inc/modules/admin/action-payouts.php        |  2 +-
 inc/modules/admin/action-primera.php        |  2 +-
 inc/modules/admin/action-rallye.php         |  2 +-
 inc/modules/admin/action-repair.php         |  2 +-
 inc/modules/admin/action-setup.php          |  2 +-
 inc/modules/admin/action-sponsor.php        |  2 +-
 inc/modules/admin/action-stats.php          |  2 +-
 inc/modules/admin/action-surfbar.php        |  2 +-
 inc/modules/admin/action-task.php           |  2 +-
 inc/modules/admin/action-theme.php          |  2 +-
 inc/modules/admin/action-transfer.php       |  2 +-
 inc/modules/admin/action-user.php           |  2 +-
 inc/modules/admin/action-wernis.php         |  2 +-
 inc/modules/admin/admin-inc.php             |  2 +-
 inc/modules/admin/what-add_points.php       |  4 +--
 inc/modules/admin/what-add_rallye.php       |  6 ++---
 inc/modules/admin/what-admins_contct.php    |  4 +--
 inc/modules/admin/what-del_email.php        |  2 +-
 inc/modules/admin/what-del_holiday.php      |  4 +--
 inc/modules/admin/what-del_sponsor.php      |  2 +-
 inc/modules/admin/what-edit_sponsor.php     |  8 +++---
 inc/modules/admin/what-extensions.php       |  4 +--
 inc/modules/admin/what-list_country.php     |  4 +--
 inc/modules/admin/what-list_links.php       |  2 +-
 inc/modules/admin/what-list_payouts.php     |  4 +--
 inc/modules/admin/what-list_unconfirmed.php |  2 +-
 inc/modules/admin/what-list_user.php        |  2 +-
 inc/modules/admin/what-lock_user.php        |  4 +--
 inc/modules/admin/what-sub_points.php       |  4 +--
 inc/modules/admin/what-unlock_emails.php    |  4 +--
 inc/modules/admin/what-unlock_sponsor.php   |  4 +--
 inc/modules/admin/what-user_contct.php      |  2 +-
 inc/modules/guest/action-admin.php          |  2 +-
 inc/modules/guest/action-main.php           |  2 +-
 inc/modules/guest/action-members.php        |  2 +-
 inc/modules/guest/action-sponsor.php        |  2 +-
 inc/modules/guest/what-confirm.php          |  6 ++---
 inc/modules/guest/what-mediadata.php        | 26 +++++++++---------
 inc/modules/guest/what-register.php         |  2 +-
 inc/modules/guest/what-sponsor_login.php    |  6 ++---
 inc/modules/guest/what-sponsor_reg.php      |  6 ++---
 inc/modules/guest/what-stats.php            |  4 +--
 inc/modules/member/action-                  |  2 +-
 inc/modules/member/what-holiday.php         |  2 +-
 inc/modules/member/what-payout.php          |  2 +-
 inc/modules/member/what-transfer.php        |  6 ++---
 inc/modules/order.php                       |  2 +-
 inc/modules/sponsor.php                     |  2 +-
 inc/modules/sponsor/.php                    |  2 +-
 inc/modules/sponsor/account.php             |  2 +-
 inc/modules/sponsor/settings.php            |  2 +-
 inc/modules/sponsor/welcome.php             |  2 +-
 inc/monthly/monthly_beg.php                 |  2 +-
 inc/monthly/monthly_bonus.php               |  2 +-
 inc/mysql-connect.php                       |  6 ++---
 inc/mysql-manager.php                       |  8 +++---
 inc/pool/pool-user.php                      |  4 +--
 inc/reset/reset_100_bonus.php               |  2 +-
 inc/reset/reset_birthday.php                |  2 +-
 inc/reset/reset_holiday.php                 |  2 +-
 inc/reset/reset_profile.php                 | 17 +++++-------
 install.php                                 |  2 +-
 modules.php                                 |  4 +--
 92 files changed, 181 insertions(+), 184 deletions(-)

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 3f98e7023a..a6fc4fc347 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -101,14 +101,14 @@ ORDER BY
 			$content = merge_array($content, $row);
 
 			// Remember userids for the admin
-			$useridsContent .= $content['userid'].", ";
+			$useridsContent .= $content['userid'] . ', ';
 
 			// Get date/time from timestamp
 			$content['last_online'] = generateDateTime($content['last_online'], 0);
 
 			// Load mail template
 			$message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $message);
+			sendEmail($content['email'], '{--AUTOPURGE_MEMBER_INACTIVE_SUBJECT--}', $message);
 
 			// Update this account
 			addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 22c40b3587..4bc33da72f 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -984,7 +984,7 @@ function createNewExtensionTask ($adminId, $subject, $ext) {
 // Creates a task for automatically deactivated (deprecated) extension
 function createExtensionDeactivationTask ($ext) {
 	// Create subject line
-	$subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED'));
+	$subject = sprintf("[%s:] %s", $ext, '{--TASK_SUBJ_EXTENSION_DEACTIVATED--}');
 
 	// Not installed and do we have created a task for the admin?
 	if ((determineTaskIdBySubject($subject) == '0') && (isExtensionInstalled($ext))) {
@@ -1109,13 +1109,13 @@ function addExtensionNotes ($ver) {
 			// Initial release
 			$content = array(
 				'ver'   => $ver,
-				'notes' => getMessage('INITIAL_RELEASE')
+				'notes' => '{--INITIAL_RELEASE--}'
 			);
 		} else {
 			// No update notes found!
 			$content = array(
 				'ver'   => $ver,
-				'notes' => getMessage('NO_UPDATE_NOTES')
+				'notes' => '{--NO_UPDATE_NOTES--}'
 			);
 		}
 
diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 42f7f5857e..14e59feaee 100644
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -56,7 +56,7 @@ switch (getExtensionMode()) {
 		// Check if mod_rewrite is loadeded
 		if (!isApacheModuleLoaded('mod_rewrite')) {
 			setExtensionReportsFailure(true);
-			addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+			addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 		} // END - if
 
 		// SQL commands to run
@@ -73,7 +73,7 @@ switch (getExtensionMode()) {
 		if (!isApacheModuleLoaded('mod_rewrite')) {
 			SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
 			setExtensionReportsFailure(true);
-			addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+			addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 	 } // END - if
 
 	 // SQL commands to run
@@ -151,7 +151,7 @@ switch (getExtensionMode()) {
 				// Check if mod_rewrite is loadeded
 				if (!isApacheModuleLoaded('mod_rewrite')) {
 					setExtensionReportsFailure(true);
-					//addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+					//addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 				} // END - if
 				setExtensionUpdateNotes("Es wird beim Registrieren und aktivieren gepr&uuml;ft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.");
 				break;
@@ -169,7 +169,7 @@ switch (getExtensionMode()) {
 		if (!isApacheModuleLoaded('mod_rewrite')) {
 			setExtensionReportsFailure(true);
 			SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
-			if (!isAdmin()) addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+			if (!isAdmin()) addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 		} // END - if
 		break;
 
diff --git a/inc/filters.php b/inc/filters.php
index a96ee6022a..658e0fb17b 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -56,7 +56,7 @@ function FILTER_FLUSH_FILTERS () {
 	// Is a database link here and not in installation mode?
 	if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
 		// Abort here
-		addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
+		addFatalMessage(__FUNCTION__, __LINE__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}');
 		return false;
 	} // END - if
 
diff --git a/inc/functions.php b/inc/functions.php
index 7448f7e5cc..107542e91f 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3133,7 +3133,7 @@ function shutdown () {
 		SQL_CLOSE(__FUNCTION__, __LINE__);
 	} elseif (!isInstallationPhase()) {
 		// No database link
-		addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+		addFatalMessage(__FUNCTION__, __LINE__, '{--NO_DB_LINK_SHUTDOWN--}');
 	}
 
 	// Stop executing here
@@ -3544,7 +3544,7 @@ function determinePageTitle () {
 		$pageTitle = '{--NO_CONFIG_FOUND_TITLE--}';
 
 		// Do not add the fatal message in installation mode
-		if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+		if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, '{--NO_CONFIG_FOUND--}');
 	}
 
 	// Return title
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 17c0c0c633..2962d374a7 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -202,7 +202,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 						// Check for dumps
 						if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
 							// Installation area not found!
-							addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+							addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
 							return;
 						} // END - if
 
@@ -234,7 +234,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 							// Are some SQLs found?
 							if (countSqls() == 0) {
 								// Abort here
-								addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+								addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
 								return;
 							} // END - if
 
@@ -273,7 +273,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 				}
 			} else {
 				// Something goes wrong during installation! :-(
-				addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+				addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
 			}
 			break;
 
@@ -294,7 +294,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 	} // END - switch
 } else {
 	// Already installed!
-	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+	addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 }
 
 // [EOF]
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index b06ff86814..0e50ea7168 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -311,12 +311,12 @@ function adminsEditAdminAccount ($postData) {
 			// Shall we allow changing default ACL?
 			if ($currMode == 'allow') {
 				// Allow chaning it
-				$content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array(getMessage('ADMINS_ALLOW_MODE'), getMessage('ADMINS_DENY_MODE')), $content['mode']);
+				$content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']);
 			} else {
 				// Don't allow it
 				$content['mode'] = '&nbsp;';
 			}
-			$content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array(getMessage('ADMINS_GLOBAL_LA_SETTING'), getMessage('ADMINS_OLD_LA_SETTING'), getMessage('ADMINS_NEW_LA_SETTING')), $content['la_mode']);
+			$content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
 
 			// Load row template and switch color
 			$OUT .= loadTemplate('admin_edit_admins_row', true, $content);
diff --git a/inc/libs/autopurge_functions.php b/inc/libs/autopurge_functions.php
index 8c5372fd11..76be497ee5 100644
--- a/inc/libs/autopurge_functions.php
+++ b/inc/libs/autopurge_functions.php
@@ -49,7 +49,7 @@ function addPointsAutoPurge ($userid, $points) {
 
 	// Send out mail to user
 	$message = loadEmailTemplate('member_autopurge_points', array('points' => $points), $userid);
-	sendEmail($userid, getMessage('AUTOPURGE_MEMBER_SUBJECT'), $message);
+	sendEmail($userid, '{--AUTOPURGE_MEMBER_SUBJECT--}', $message);
 }
 
 // [EOF]
diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 0b07bf1a30..54064d8b19 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -85,7 +85,7 @@ LIMIT 1",
 
 			// Send mail to user
 			$message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+			sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJ--}', $message);
 
 			// Remember userid for admin
 			$admin .= $content['userid']."\n";
diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 001d5b26be..8f4e0a59f4 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -62,7 +62,7 @@ function doNetworkHandleForm () {
 			doAdminNetworkProcessForm();
 		} else {
 			// No 'do' found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
 		}
 	} // END - if
 }
@@ -72,11 +72,11 @@ function doAdminNetworkProcessForm () {
 	// Form really sent?
 	if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
 		// Abort here
-		loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
+		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
 		return;
 	} elseif (!isGetRequestParameterSet('do')) {
 		// No 'do' found
-		loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
+		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
 		return;
 	}
 
@@ -381,7 +381,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -425,7 +425,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -469,7 +469,7 @@ ORDER BY
 		$content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
 	} else {
 		// Nothing selected
-		$content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+		$content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
 	}
 
 	// Free the result
@@ -682,7 +682,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -749,7 +749,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -828,7 +828,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 			$GLOBALS['network_display'] = false;
 		} else {
 			// Nothing selected/found
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
 		}
 	} // END - if
 }
@@ -873,7 +873,7 @@ function doAdminNetworkProcessChangenetworkForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -900,7 +900,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -993,7 +993,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1044,7 +1044,7 @@ function doAdminNetworkProcessChangenetworkparamForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
 		} else {
 			// Nothing changed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
 		}
 	} // END - if
 }
@@ -1071,7 +1071,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
@@ -1098,7 +1098,7 @@ function doAdminNetworkProcessRemovenetworkparamForm () {
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
 		} else {
 			// Nothing removed
-			loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED'));
+			loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
 		}
 	} // END - if
 }
diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index 2b69d37af3..9305e2de50 100644
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -403,7 +403,7 @@ function updateMemberRefbackPercents ($id, $percents) {
 	$mail = loadEmailTemplate('member_refback', $dummy, $dummy['refid']);
 
 	// Send email to user
-	sendEmail($dummy['refid'], getMessage('MEMBER_REFBACK_SUBJECT'), $mail);
+	sendEmail($dummy['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail);
 
 	// Send admin notification
 	sendAdminNotification(getMessage('ADMIN_REFBACK_SUBJECT'), 'admin_refback', $dummy, getMemberId());
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 4a58e2355b..4da3b60270 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -466,7 +466,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
 	// Send mail to user (confirmation link!)
 	$email = $content['email'];
-	sendEmail($content['email'], getMessage('GUEST_SUBJECT_CONFIRM_LINK'), $messageGuest);
+	sendEmail($content['email'], '{--GUEST_SUBJECT_CONFIRM_LINK--}', $messageGuest);
 	$content['email'] = $email;
 
 	// Send mail to admin
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index cf855ac254..80d000c93f 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -491,7 +491,7 @@ function saveSponsorData ($postData, $content) {
 				switch (getWhat()) {
 					case 'account': // Change account data
 						$email_msg = loadEmailTemplate('sponsor_change_data', $content);
-						sendEmail($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg);
+						sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJ--}', $email_msg);
 
 						if ($EMAIL === true) {
 							// Add hash code to content array
@@ -499,14 +499,14 @@ function saveSponsorData ($postData, $content) {
 
 							// Second mail goes to the new address
 							$email_msg = loadEmailTemplate('sponsor_change_email', $content);
-							sendEmail($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg);
+							sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJ--}', $email_msg);
 						} // END - if
 						break;
 
 					case 'settings': // Change settings
 						// Send email
 						$email_msg = loadEmailTemplate('sponsor_settings', $content);
-						sendEmail($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg);
+						sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJ--}', $email_msg);
 						break;
 				} // END - switch
 			} // END - if
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 5d311cd7e9..71973d37ea 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -418,7 +418,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
 		} // END - if
 	} else {
 		// Not found!
-		addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName);
+		addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName);
 	}
 
 	// Return status
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 517f0ebdd3..d400066002 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -49,7 +49,7 @@ function alpha ($sortby, $colspan, $return=false) {
 	if (isGetRequestParameterSet('mode')) $add .= '&amp;mode='.getRequestParameter('mode');
 
 	/* Creates the list of letters and makes them a link. */
-	$alphabet = explode(',', getMessage('_ALL2') . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . getMessage('_OTHERS'));
+	$alphabet = explode(',', '{--_ALL2--}' . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . '{--_OTHERS--}');
 	$num = count($alphabet) - 1;
 	$OUT = '';
 	while (list($counter, $ltr) = each($alphabet)) {
@@ -105,10 +105,10 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 
 	// Prepare array with all possible sorters
 	$list = array(
-		'userid'      => getMessage('_UID'),
-		'family'      => getMessage('FAMILY'),
-		'email'       => getMessage('EMAIL'),
-		'REMOTE_ADDR' => getMessage('REMOTE_IP')
+		'userid'      => '{--_UID--}',
+		'family'      => '{--FAMILY--}',
+		'email'       => '{--EMAIL--}',
+		'REMOTE_ADDR' => '{--REMOTE_IP--}'
 	);
 
 	// Add nickname if extension is installed
@@ -159,7 +159,7 @@ function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=fal
 		if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
 			$OUT .= '<strong>-';
 		} else {
-			if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+			if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '{--_ALL2--}');
 			if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
 			// Base link
@@ -453,7 +453,7 @@ function doNewUserPassword ($email, $userid) {
 			$message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
 			// ... and send it away
-			sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
+			sendEmail($userid, '{--GUEST_NEW_PASSWORD--}', $message);
 
 			// Output note to user
 			loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index a6fe7be92e..2c3a85df5b 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -80,7 +80,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
 		// Then abort here!
 		return array(
 			'status'  => 'failed_general',
-			'message' => getMessage('WERNIS_API_REQUEST_DATA_INVALID')
+			'message' => '{--WERNIS_API_REQUEST_DATA_INVALID--}'
 		);
 	} // END - if
 
@@ -89,7 +89,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
 		// Abort here...
 		return array(
 			'status'  => 'failed_general',
-			'message' => getMessage('WERNIS_API_REQUEST_DATA_MISSING')
+			'message' => '{--WERNIS_API_REQUEST_DATA_MISSING--}'
 		);
 	} // END - if
 
@@ -148,7 +148,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
 			case 'AUTH': // Authorization has failed
 				$return = array(
 					'status'  => 'auth_failed',
-					'message' => getMessage('WERNIS_API_REQUEST_FAILED_AUTH')
+					'message' => '{--WERNIS_API_REQUEST_FAILED_AUTH--}'
 				);
 				break;
 
@@ -157,28 +157,28 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
 			case 'USER': // Missing account or invalid password
 				$return = array(
 					'status'  => 'user_failed',
-					'message' => getMessage('WERNIS_API_REQUEST_FAILED_USER')
+					'message' => '{--WERNIS_API_REQUEST_FAILED_USER--}'
 				);
 				break;
 
 			case 'OWN': // Transfer to own account
 				$return = array(
 					'status'  => 'own_failed',
-					'message' => getMessage('WERNIS_API_REQUEST_FAILED_OWN')
+					'message' => '{--WERNIS_API_REQUEST_FAILED_OWN--}'
 				);
 				break;
 
 			case 'AMOUNT': // Amount is depleted
 				$return = array(
 					'status'  => 'amount_failed',
-					'message' => getMessage('WERNIS_API_REQUEST_FAILED_AMOUNT')
+					'message' => '{--WERNIS_API_REQUEST_FAILED_AMOUNT--}'
 				);
 				break;
 
 			case 'AMOUNT-SEND': // API amount is depleted
 				$return = array(
 					'status'  => 'api_amount_failed',
-					'message' => getMessage('WERNIS_API_REQUEST_FAILED_API_AMOUNT')
+					'message' => '{--WERNIS_API_REQUEST_FAILED_API_AMOUNT--}'
 				);
 				break;
 
diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index a26123480e..ffb1121bd9 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -188,7 +188,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 
 			// Load mail template and send mail away...
 			$message = loadEmailTemplate('member_doubler', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('DOUBLER_MEMBER_SUBJECT'), $message);
+			sendEmail($content['userid'], '{--DOUBLER_MEMBER_SUBJECT--}', $message);
 		} // END - if
 	} // END - while
 } // END - if
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 14c4809dd0..3ea2e49dc9 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -352,7 +352,7 @@ if (!isAdminRegistered()) {
 		loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
 
 		// Add fatal message
-		addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
+		addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
 	}
 } else {
 	// Maybe an Admin want's to login?
diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index 73b2fc342a..93d1899f6b 100644
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php
index ebd637b98d..fce5df4966 100644
--- a/inc/modules/admin/action-bank.php
+++ b/inc/modules/admin/action-bank.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index a39f4bd5f7..6e2c5540fb 100644
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index 724773bf2d..b14905c0cc 100644
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -52,7 +52,7 @@ if (isIncludeReadable($inc)) {
 	loadInclude($inc);
 } else {
 	// "what file" not found
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index d874eba865..43250f1e33 100644
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index 2c3437fa59..40c627a809 100644
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index 7420fb5a20..38d95a13b2 100644
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index f68228519b..ee3e5efbc9 100644
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 64fe147942..62e677d971 100644
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 //
diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index 4729d6e0e9..9053888fe4 100644
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index 5da301212c..611a41093f 100644
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 8b1702c184..1cd17de579 100644
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php
index 50a785e53d..9d8d02d709 100644
--- a/inc/modules/admin/action-primera.php
+++ b/inc/modules/admin/action-primera.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index f6bf141423..a703482c49 100644
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index 6e7756a582..bbdbaf7538 100644
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index 0e3496d28d..3edce1f8ce 100644
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index 3f85e844fc..6fbc041ff1 100644
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index 4084274d8c..f904b45f48 100644
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php
index ca5996c3ef..3054eef07e 100644
--- a/inc/modules/admin/action-surfbar.php
+++ b/inc/modules/admin/action-surfbar.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 40ee2efd50..deeb1c839b 100644
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -56,7 +56,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index e9d037560b..03d5a25029 100644
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index e776de9f25..859f1d97fa 100644
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index a6c63c1ee3..249fe36dba 100644
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index 2165992eee..25484708cc 100644
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 //
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index cbd8f464d3..40e5d1aaca 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1133,7 +1133,7 @@ function sendAdminPasswordResetLink ($email) {
 	$mailText = loadEmailTemplate('admin_reset_password', $content);
 
 	// Send it out
-	sendEmail($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
+	sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJ--}', $mailText);
 
 	// Prepare output
 	return getMessage('ADMIN_RESET_LINK_SENT');
diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 5c64717b9e..7d0921b664 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -74,7 +74,7 @@ if (getRequestParameter('userid') == 'all') {
 
 			// Load email template and send email away
 			$message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
-			sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $message);
+			sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJ--}', $message);
 		} // END - while
 
 		// Free memory
@@ -105,7 +105,7 @@ if (getRequestParameter('userid') == 'all') {
 			// Message laden
 			$message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid')));
 
-			sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_ADD_SUBJ'), $message);
+			sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJ--}', $message);
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
 		} else {
 			// Prepare content
diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 4ddb85bf33..04c3486965 100644
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -93,9 +93,9 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
 }
 
 // Prepare some constants for the template
-$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
-$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array(getMessage('NO') , getMessage('YES')));
-$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
+$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), '{--NO--}' ));
+$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array(getMessage('NO') , '{--YES--}'));
+$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), '{--NO--}' ));
 
 // Starting day
 $content['start_sec']   = addSelectionBox('sec'  , 0              , 'start');
diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php
index 9203b250af..b0d89e2442 100644
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -50,14 +50,14 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
 	if ((isExtensionActive('msg')) && (postRequestParameter('type') == 'message')) {
 		// Add message
 		$message = loadEmailTemplate('admins_msg_contct_admin', postRequestParameter('text'), 0);
-		sendAdminMessage(getRequestParameter('admin'), getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
+		sendAdminMessage(getRequestParameter('admin'), '{--ADMINS_MSG_FROM_ADMIN--}', $message);
 	} else {
 		// Load admin's email address
 		$email = getAdminEmail(bigintval(getRequestParameter('admin')));
 
 		// Load email template and send the mail to the admin
 		$message = loadEmailTemplate('admins_mail_contct_admin', postRequestParameter('text'), 0);
-		sendEmail($email, getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
+		sendEmail($email, '{--ADMINS_MSG_FROM_ADMIN--}', $message);
 	}
 
 	// Mail / message dropped
diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index c2d870f324..0e98689ede 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -68,7 +68,7 @@ if (isGetRequestParameterSet('mid')) {
 
 		// Load email template and send the email away
 		$message_user = loadEmailTemplate('order-deleted', $content, $sender);
-		sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $message_user);
+		sendEmail($sender, '{--MEMBER_ORDER_DELETED--}', $message_user);
 
 		// Fetch right stats_id from pool
 		$result_pool = SQL_QUERY_ESC("SELECT
diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 19d0175533..6361bd3fa2 100644
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -87,7 +87,7 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
 			// Send email to user
 			$message = loadEmailTemplate('member_holiday_removed', $content, $userid);
-			sendEmail($userid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+			sendEmail($userid, '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
 			$cnt++;
 		}
 	}
@@ -118,7 +118,7 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 
 		// Send email to user
 		$message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid'));
-		sendEmail(getRequestParameter('userid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+		sendEmail(getRequestParameter('userid'), '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
 
 		// Set message
 		$message = '{--HOLIDAY_ADMIN_SINGLE_DELETED--}';
diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index c1c493d81a..c66851f6a5 100644
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -61,7 +61,7 @@ if (isGetRequestParameterSet('id')) {
 
 			// Prepare message and send it away
 			$message = loadEmailTemplate('del_sponsor', $content, bigintval(getRequestParameter('id')));
-			sendEmail($content['email'], getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $message);
+			sendEmail($content['email'], '{--ADMIN_SPONSOR_DEL_SUBJECT--}', $message);
 
 			// Remove account
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1",
diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index b41767f444..059fce33be 100644
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -101,7 +101,7 @@ LIMIT 1",
 
 						// Send email
 						$message = loadEmailTemplate('sponsor_add_points', $content);
-						sendEmail($content['email'], getMessage('ADMIN_SPONSOR_ADD_POINTS_SUBJ'), $message);
+						sendEmail($content['email'], '{--ADMIN_SPONSOR_ADD_POINTS_SUBJ--}', $message);
 						$message = '{--ADMIN_SPONSOR_POINTS_ADDED--}';
 					} else {
 						// No points entered to add!
@@ -124,7 +124,7 @@ LIMIT 1",
 
 						// Send email
 						$message = loadEmailTemplate('sponsor_sub_points', $content);
-						sendEmail($content['email'], getMessage('ADMIN_SPONSOR_SUB_POINTS_SUBJ'), $message);
+						sendEmail($content['email'], '{--ADMIN_SPONSOR_SUB_POINTS_SUBJ--}', $message);
 						$message = '{--ADMIN_SPONSOR_POINTS_SUBTRACTED--}';
 					} else {
 						// No points entered to add!
@@ -152,11 +152,11 @@ LIMIT 1",
 					postRequestParameter('gender'          , translateGender(postRequestParameter('gender')));
 					postRequestParameter('warning_interval', createFancyTime(postRequestParameter('warning_interval')));
 
-					if ($PASS === false) setPostRequestParameter('pass1', getMessage('SPONSOR_PASS_UNCHANGED'));
+					if ($PASS === false) setPostRequestParameter('pass1', '{--SPONSOR_PASS_UNCHANGED--}');
 
 					// Load email template and send the mail away
 					$message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), false);
-					sendEmail(postRequestParameter('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $message);
+					sendEmail(postRequestParameter('email'), '{--ADMIN_SPONSOR_EDIT_SUBJECT--}', $message);
 					break;
 
 				default: // Unknown mode
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 24f0716a65..5dd017ec47 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -346,12 +346,12 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 							if (isExtensionActive('task')) {
 								loadTemplate('admin_next_link', false, array(
 									'url'   => 'modules.php?module=admin&amp;what=list_task',
-									'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
+									'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
 								));
 							} else {
 								loadTemplate('admin_next_link', false, array(
 									'url'   => 'modules.php?module=admin',
-									'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
+									'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
 								));
 							}
 						} else {
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 43cda0efda..f7c4fd16a7 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -78,7 +78,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 	// Show next link
 	loadTemplate('admin_next_link', false, array(
 		'url'   => 'modules.php?module=admin&amp;what=list_country',
-		'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
+		'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
 	));
 } elseif (((isFormSent('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
 	if (count(postRequestParameter('id')) > 0) {
@@ -121,7 +121,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
 				if ($post == 'modify') {
 					// Generate default selection in edit-mode
-					$content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array(getMessage('YES'), getMessage('NO')), $status);
+					$content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $status);
 				} else {
 					// Only display status when in delete-mode
 					$content['status'] = translateYesNo($status);
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index e3201889f1..cd560e6dd7 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -77,7 +77,7 @@ if (isGetRequestParameterSet('userid')) {
 
 				// Prepare mail and send it away
 				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-				sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+				sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJ--}', $message);
 
 				// Display message
 				loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 4fa53756a5..cd00ee7295 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -152,7 +152,7 @@ LIMIT 1",
 						}
 
 						// Finally send mail
-						sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_ACCEPTED_SUBJECT'), $message);
+						sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_ACCEPTED_SUBJECT--}', $message);
 					} else {
 						// Something goes wrong... :-(
 						$content = implode('<br />', $ret);
@@ -192,7 +192,7 @@ LIMIT 1",
 				loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
 
 				// Finally send mail
-				sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message);
+				sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_REJECTED_SUBJECT--}', $message);
 			} else {
 				// Prepare content
 				$content = array(
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 920c3cd20d..a016dbe653 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -74,7 +74,7 @@ LIMIT 1";
 	// Load admin_list_unconfirmed template
 	$listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
-	// @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+	// @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
 
 	// SQL query for mail data (both ids are required for compatiblity to above normal mail
 	$sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index b8ce952787..0e90bfb8d2 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -86,7 +86,7 @@ if (isExtensionActive('country')) {
 }
 
 // Init unset data
-if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); }
+if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', '{--_ALL2--}'); }
 if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid');            }
 if (!isGetRequestParameterSet('page'))   { setGetRequestParameter('page'  , 1);                 }
 
diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index f91f2aedd4..9eb4635bf8 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -71,7 +71,7 @@ if (isGetRequestParameterSet('userid')) {
 				$message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
 				// Send away...
-				sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_LOCKED_SUBJ'), $message);
+				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJ--}', $message);
 			} // END - if
 
 			// Prepare message
@@ -103,7 +103,7 @@ LIMIT 1",
 				$message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
 				// Send away...
-				sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $message);
+				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJ--}', $message);
 				if (isExtensionActive('rallye')) {
 					addUserToReferalRallye(getRequestParameter('userid'));
 				} // END - if
diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 48e91900ef..06074f5df0 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -67,7 +67,7 @@ if (getRequestParameter('userid') == 'all') {
 
 			// Load message and send it away
 			$message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message);
 		} // END - while
 
 		// Free memory
@@ -95,7 +95,7 @@ if (getRequestParameter('userid') == 'all') {
 
 			// Load email and send it away
 			$message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message);
 
 			// Output message
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}');
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index e5e116a770..c8d9ef649e 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -106,7 +106,7 @@ LIMIT 1",
 					$message_user = loadEmailTemplate('order-accept', $content, $content['sender']);
 
 					// Send email
-					sendEmail($content['sender'], getMessage('MEMBER_ORDER_ACCEPTED'), $message_user);
+					sendEmail($content['sender'], '{--MEMBER_ORDER_ACCEPTED--}', $message_user);
 
 					// Unlock selected email
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW' WHERE `id`=%s AND `data_type`='ADMIN' LIMIT 1",
@@ -143,7 +143,7 @@ LIMIT 1",
 
 				// Load email template and send it away
 				$message_user = loadEmailTemplate('order-reject', $content, $content['sender']);
-				sendEmail($content['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
+				sendEmail($content['sender'], '{--MEMBER_ORDER_REJECTED--}', $message_user);
 
 				// If you do not enter an URL to redirect to, your URL will be set!
 				if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getConfig('URL'));
diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index b4af6fa752..a86a7f890f 100644
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -165,7 +165,7 @@ LIMIT 1",
 					if ($REFERAL['receive_warnings'] == 'Y') {
 						// Send notification to referal
 						$REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL);
-						sendEmail($REFERAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG);
+						sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJ--}', $REF_MSG);
 					} // END - if
 
 					// Free memory
@@ -178,7 +178,7 @@ LIMIT 1",
 
 			// So let's send the email away
 			$message = loadEmailTemplate('sponsor_unlocked', $content);
-			sendEmail($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $message);
+			sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJ--}', $message);
 		} // END - foreach
 	} else {
 		// Nothing selected
diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php
index 95525b00fb..a7ecebb2d2 100644
--- a/inc/modules/admin/what-user_contct.php
+++ b/inc/modules/admin/what-user_contct.php
@@ -64,7 +64,7 @@ if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('user
 			$message = loadEmailTemplate('member_contct', $content, getRequestParameter('userid'));
 
 			// Send contact form out
-			sendEmail($content['email'], getMessage('ADMIN_CONTACT_USER_SUBJECT'), $message);
+			sendEmail($content['email'], '{--ADMIN_CONTACT_USER_SUBJECT--}', $message);
 
 			// Display message
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_CONTACTED--}');
diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 8b51d0b1b2..8c87c355a7 100644
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the guest action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index e698f0e7ac..8bc2251a9e 100644
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the guest action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index 72c40b1f40..a97e479d7a 100644
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the guest action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 5502ddaebf..4b044ed53a 100644
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -50,7 +50,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the guest action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 38018fd621..2c3025c6ca 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -47,7 +47,7 @@ addMenuDescription('guest', __FILE__);
 
 // Init content
 $content = array(
-	'message' => getMessage('GUEST_CONFIRMED_FAILED'),
+	'message' => '{--GUEST_CONFIRMED_FAILED--}',
 	'userid'  => 0,
 );
 
@@ -88,7 +88,7 @@ LIMIT 1",
 			$message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
 
 			// And send him right away the confirmation mail
-			sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message);
+			sendEmail($email, '{--GUEST_THANX_CONFIRM--}', $message);
 
 			// Maybe he got "referaled"?
 			if (($refid > 0) && ($refid != $userid)) {
@@ -169,7 +169,7 @@ LIMIT 1",
 				$message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
 				// Send email
-				sendEmail(postRequestParameter('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
+				sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJ--}', $message);
 
 				// And set message
 				$content['message'] = '{--CONFIRM_LINK_SENT--}';
diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 50078e5ade..804b4191fe 100644
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -77,7 +77,7 @@ $TEST = makeTime(0, 0, 0, $PROJECTED);
 if ($TEST > time()) {
 	$content['projected'] = getMaskedMessage('USER_MT_PROJECTED', generateDateTime($PROJECTED, 3));
 } else {
-	$content['projected'] = getMaskedMessage('USER_MT_PROJECTED', getMessage('USER_PROJECTION_UNKNOWN'));
+	$content['projected'] = getMaskedMessage('USER_MT_PROJECTED', '{--USER_PROJECTION_UNKNOWN--}');
 }
 
 // User who can receive mails
@@ -184,7 +184,7 @@ $OUT_SPECIAL = ''; // We don't need row count here
 if (isExtensionActive('beg')) {
 	// Clicks on beg links
 	$data = array(
-		'lang'  => getMessage('MEDIA_BEG_CLICKS'),
+		'lang'  => '{--MEDIA_BEG_CLICKS--}',
 		'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, " AND `beg_clicks` > 0")
 	);
 	$OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data);
@@ -192,28 +192,28 @@ if (isExtensionActive('beg')) {
 
 if (isExtensionActive('doubler')) {
 	// Add header
-	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, getMessage('MEDIA_DOUBLER_HEADER'));
+	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_DOUBLER_HEADER--}');
 
 	// Add first line (count)
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_COUNT'),
+		'lang'  => '{--MEDIA_DOUBLER_COUNT--}',
 		'value' => countSumTotalData('Y','doubler','id','completed', true, " AND `points` > 0"),
 	);
 
 	// Add points
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_CPOINTS'),
+		'lang'  => '{--MEDIA_DOUBLER_CPOINTS--}',
 		'value' => translateComma(countSumTotalData('Y','doubler','id','completed', false, " AND `points` > 0"))
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_WAITING'),
+		'lang'  => '{--MEDIA_DOUBLER_WAITING--}',
 		'value' => translateComma(countSumTotalData('N','doubler','id','completed', true, " AND `points` > 0"))
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_WPOINTS'),
+		'lang'  => '{--MEDIA_DOUBLER_WPOINTS--}',
 		'value' => translateComma(countSumTotalData('N','doubler','id','completed', false, " AND `points` > 0"))
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
@@ -236,7 +236,7 @@ WHERE
 	SQL_FREERESULT($result);
 	if (empty($holiday)) $holiday = '0';
 	$data = array(
-		'lang'  => getMessage('MEDIA_HOLIDAY_COUNT'),
+		'lang'  => '{--MEDIA_HOLIDAY_COUNT--}',
 		'value' => $holiday
 	);
 	$OUT_USER .= loadTemplate('mediadata_extra_row', true, $data);
@@ -269,24 +269,24 @@ ON t.userid=d.userid",
 	if (empty($points_out)) $points_out = '0';
 
 	// Add header
-	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, getMessage('MEDIA_TRANSFER_HEADER'));
+	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_TRANSFER_HEADER--}');
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_IN_COUNT'),
+		'lang'  => '{--MEDIA_TRANSFER_IN_COUNT--}',
 		'value' => $count_in,
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_IN_POINTS'),
+		'lang'  => '{--MEDIA_TRANSFER_IN_POINTS--}',
 		'value' => translateComma($points_in)
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_OUT_COUNT'),
+		'lang'  => '{--MEDIA_TRANSFER_OUT_COUNT--}',
 		'value' => $count_out
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_OUT_POINTS'),
+		'lang'  => '{--MEDIA_TRANSFER_OUT_POINTS--}',
 		'value' => translateComma($points_out)
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index c712e17ca7..a44a10ec2d 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -103,7 +103,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 		} // END - if
 
 		if ((!empty($GLOBALS['register_selected_cats'])) && ($GLOBALS['register_selected_cats'] < getConfig('least_cats'))) {
-			registerOutputFailedMessage('', getMessage('CATS_LEAST'));
+			registerOutputFailedMessage('', '{--CATS_LEAST--}');
 		} // END - if
 	} // END - if
 
diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 1952a4ca5f..e4fb6d12e0 100644
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -97,7 +97,7 @@ LIMIT 1",
 			if (SQL_AFFECTEDROWS() == 1) {
 				// Prepare mail and send it to the sponsor
 				$message = loadEmailTemplate('sponsor_pending', $data);
-				sendEmail($data['email'], getMessage('SPONSOR_ACCOUNT_PENDING_SUBJ'), $message);
+				sendEmail($data['email'], '{--SPONSOR_ACCOUNT_PENDING_SUBJ--}', $message);
 
 				// Send email to admin
 				sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data);
@@ -170,7 +170,7 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
 				// Confirmed email address
 				$message_sponsor = loadEmailTemplate('sponsor_email', $data);
 			}
-			sendEmail(postRequestParameter('email'), getMessage('SPONSOR_ACTIVATION_LINK_SUBJ'), $message_sponsor);
+			sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJ--}', $message_sponsor);
 
 			// Output message
 			loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_SENT--}');
@@ -213,7 +213,7 @@ WHERE `email`='%s' AND `id`='%s' AND `status`='CONFIRMED' LIMIT 1",
 
 			// Prepare email and send it to the sponsor
 			$message_sponsor = loadEmailTemplate('sponsor_lost', $DATA);
-			sendEmail(postRequestParameter('email'), getMessage('SPONSOR_LOST_PASSWORD_SUBJ'), $message_sponsor);
+			sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJ--}', $message_sponsor);
 
 			// Update password
 			SQL_QUERY_ESC("UPDATE
diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 18c3ba173b..d3adcafea5 100644
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -202,8 +202,8 @@ if (isFormSent()) {
 if ((isFormSent()) && (count($FORM_ERRORS) == 0)) {
 	// Generate message array
 	$messageArray = array(
-		'failed' => getMessage('SPONSOR_REGISTRATION_FAILED'),
-		'added'  => getMessage('SPONSOR_REGISTRATION_COMPLETED'),
+		'failed' => '{--SPONSOR_REGISTRATION_FAILED--}',
+		'added'  => '{--SPONSOR_REGISTRATION_COMPLETED--}',
 	);
 
 	// Calulate points
@@ -247,7 +247,7 @@ WHERE `id`='%s' LIMIT 1",
 
 				// Generate email and send it to the new sponsor
 				$message = loadEmailTemplate('sponsor_confirm', $hash);
-				sendEmail(postRequestParameter('email'), getMessage('SPONSOR_PLEASE_CONFIRM_SUBJ'), $message);
+				sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJ--}', $message);
 
 				// Send mail to admin
 				sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_reg', $hash);
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index d289d11caa..2ef513ca78 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -198,7 +198,7 @@ switch (getConfig('guest_stats')) {
 
 		if (SQL_NUMROWS($guest_t10) > 0) {
 			// Guest clicks
-			$OUT .= loadTemplate('guest_stats_header', true, getMessage('GUEST_TOP_GUEST_STATS'));
+			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_GUEST_STATS--}');
 			$SW = 2;
 			while ($content = SQL_FETCHARRAY($guest_t10)) {
 				$content['sw'] = $SW;
@@ -211,7 +211,7 @@ switch (getConfig('guest_stats')) {
 
 		if (SQL_NUMROWS($mem_t10) > 0) {
 			// Member clicks
-			$OUT .= loadTemplate('guest_stats_header', true, getMessage('GUEST_TOP_MEMBER_STATS'));
+			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
 			$SW = 2;
 			while ($content = SQL_FETCHARRAY($mem_t10)) {
 				$content['sw'] = $SW;
diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index d2d71af066..439669684c 100644
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -61,7 +61,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the member action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, getMessage('MEMBER_404_WHAT'), getWhat());
+	addFatalMessage(__FILE__, __LINE__, '{--MEMBER_404_WHAT--}', getWhat());
 }
 
 // [EOF]
diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index bfcffff743..18742ccd14 100644
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -145,7 +145,7 @@ LIMIT 1",
 
 		// Send mail to member
 		$message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
-		sendEmail(getMemberId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
+		sendEmail(getMemberId(), '{--HOLIDAY_MEMBER_SUBJECT--}', $message);
 
 		// Send mail to all admins
 		sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId());
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index dadbf5b6ba..1fecd697b3 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -229,7 +229,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 				createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
 
 				// Send out mails
-				sendEmail(getMemberId(), getMessage('MEMBER_PAYOUT_REQUEST_SUBJ'), $message_mem);
+				sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJ--}', $message_mem);
 
 				// To admin(s)
 				sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId());
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 8fbaab9869..ffb4a4c809 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -161,14 +161,14 @@ switch ($mode) {
 
 				// First send email to recipient
 				$message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid'));
-				sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message);
+				sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJ--}' . ': ' . $SENDER, $message);
 
 				// Second send email to sender
 				$message = loadEmailTemplate('member_transfer_sender', $content, getMemberId());
-				sendEmail($content['sender']['email'], getMessage('TRANSFER_MEMBER_SENDER_SUBJ') . ': ' . $RECIPIENT, $message);
+				sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJ--}' . ': ' . $RECIPIENT, $message);
 
 				// At last send admin mail(s)
-				$adminSubject = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT);
+				$adminSubject = sprintf("%s (%s->%s)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT);
 				sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
 				// Transfer is completed
diff --git a/inc/modules/order.php b/inc/modules/order.php
index b7a46520a8..3964d689f9 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -101,7 +101,7 @@ if (empty($url)) {
 
 		// Send an email to the user
 		$message_mem = loadEmailTemplate('order-member', $content, getMemberId());
-		sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+		sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
 		// Notify admins about this
 		sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index 8fe2cba80d..6473576247 100644
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 } elseif (!isWhatSet()) {
 	// Empty what value detected!
diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php
index 1b7ed8c2ce..e1beb6300a 100644
--- a/inc/modules/sponsor/.php
+++ b/inc/modules/sponsor/.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index db18c7d152..12803bad83 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 6c06b081c1..d5d9b78ac5 100644
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 0d73865e21..4a0dcccbf3 100644
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 7554259704..a509f4d834 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -92,7 +92,7 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
 			// Load email template and email it away
 			$message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $message);
+			sendEmail($content['email'], '{--BEG_MONTHLY_RALLYE--}', $message);
 		} // END - while
 
 		// Reset accounts
diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index d4131cdae5..500f9f23d4 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -100,7 +100,7 @@ LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 
 				// Load email template and email it away
 				$message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-				sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
+				sendEmail($content['email'], '{--BONUS_MONTHLY_ONLINE_BONUS--}', $message);
 			} // END - if
 		} // END - while
 
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index c01636fe48..82e55ff719 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -121,15 +121,15 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 				}
 			} else {
 				// Wrong database?
-				addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
+				addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
 			}
 		} else {
 			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
+			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
 		}
 	} else {
 		// Maybe you forgot to enter your MySQL data?
-		addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
+		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
 	}
 } else {
 	///////////////////////////////////////////////////
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index e6d61fbcbe..559361db92 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1301,11 +1301,11 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
 
 				// Send email
-				sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
+				sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
 			} elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
 				// Prepare content
 				$content = array(
-					'text'   => getMessage('REASON_DIRECT_PAYMENT'),
+					'text'   => '{--REASON_DIRECT_PAYMENT--}',
 					'points' => $ref_points
 				);
 
@@ -1313,7 +1313,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				$message = loadEmailTemplate('add-points', $content, $userid);
 
 				// And sent it away
-				sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+				sendEmail($userid, '{--SUBJECT_DIRECT_PAYMENT--}', $message);
 				if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
 			}
 
@@ -1736,7 +1736,7 @@ LIMIT 1",
 
 	// Now a mail to the user and that's all...
 	$message = loadEmailTemplate('del-user', $data, $userid);
-	sendEmail($userid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
+	sendEmail($userid, '{--ADMIN_DEL_ACCOUNT--}', $message);
 
 	// Ok, delete the account!
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index d51453f469..85388e456a 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -189,7 +189,7 @@ if (SQL_NUMROWS($result_main) > 0) {
 							$mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
 
 							// Send it also waway
-							sendEmail(getUserData('email'), getMessage('MEMBER_SUBJ_SEND_DONE'), $mailText);
+							sendEmail(getUserData('email'), '{--MEMBER_SUBJ_SEND_DONE--}', $mailText);
 						} // END - if
 
 						// Set status to SEND because we completely send it away
@@ -279,7 +279,7 @@ if (SQL_NUMROWS($result_main) > 0) {
 					$mailText = loadEmailTemplate('back-member', $content, bigintval($userid));
 
 					// Send mail out to member
-					sendEmail(getUserData('email'), getMessage('MEMBER_BACK_JACKPOT') . ' (' . $userid . ')', $mailText);
+					sendEmail(getUserData('email'), '{--MEMBER_BACK_JACKPOT--}' . ' (' . $userid . ')', $mailText);
 				} elseif (isExtensionActive('jackpot')) {
 					// Add to jackpot
 					addPointsToJackpot($PB);
diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index f5cff9424c..7b480c1eaf 100644
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -72,7 +72,7 @@ if (SQL_NUMROWS($result_bonus) > 0) {
 
 		// Load email template and send email
 		$message = loadEmailTemplate('member_stats_bonus', $content, bigintval($content['userid']));
-		sendEmail($content['userid'], getMessage('BONUS_MEMBER_STATS_SUBJECT'), $message);
+		sendEmail($content['userid'], '{--BONUS_MEMBER_STATS_SUBJECT--}', $message);
 
 		// Update database
 		$result_update = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `bonus_stats_active`='Y' WHERE `id`=%s LIMIT 1",
diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index e2a95fd471..fb45557875 100644
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -108,7 +108,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
 		}
 
 		// Send email
-		sendEmail($content['email'], getMessage('HAPPY_BIRTHDAY_SUBJECT'), $message);
+		sendEmail($content['email'], '{--HAPPY_BIRTHDAY_SUBJECT--}', $message);
 
 		// Remember him that he has received a birthday mail
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `birthday_sent`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 09c45a55b7..bf8fffcb42 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -94,7 +94,7 @@ LIMIT 1",
 
 			// Send email to user
 			$message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $message);
+			sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJ--}', $message);
 
 			// Update account
 			addSql(SQL_QUERY_ESC("UPDATE
diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index ebd7ab008d..efb8658339 100644
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -51,20 +51,17 @@ if (!defined('__SECURITY')) {
 
 if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
 	// Load personal data
-	$result = SQL_QUERY_ESC("SELECT `userid`, `email`, `last_update`, `joined`
+	$result = SQL_QUERY("SELECT `userid`, `email`, `last_update`, `joined`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	(`last_update` < (UNIX_TIMESTAMP() - %s) AND `last_update` != 0 AND `last_profile_sent` < (UNIX_TIMESTAMP() - %s))
+	(`last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
+	`last_update` != 0 AND
+	`last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?}))
 OR
-	(`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - %s))
+	(`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - {?profile_update?}))
 ORDER BY
-	`userid` ASC",
-		array(
-			getConfig('profile_update'),
-			getConfig('resend_profile_update'),
-			getConfig('profile_update')
-		), __FILE__, __LINE__);
+	`userid` ASC", __FILE__, __LINE__);
 
 	// Do we have some notifications to sent?
 	if (SQL_NUMROWS($result) > 0) {
@@ -83,7 +80,7 @@ ORDER BY
 
 			// Load email template and send mail away
 			$message = loadEmailTemplate('profile-updte', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('PROFILE_OUTDATED'), $message);
+			sendEmail($content['email'], '{--PROFILE_OUTDATED--}', $message);
 
 			// Update profile data
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_profile_sent`=UNIX_TIMESTAMP(), `notified`='Y' WHERE `userid`=%s LIMIT 1",
diff --git a/install.php b/install.php
index 5053ac7b82..c5e1c0b4e1 100644
--- a/install.php
+++ b/install.php
@@ -82,7 +82,7 @@ setUsername('{--USERNAME_INSTALLER--}');
 // Already installed?
 if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
 	// Add fatal message
-	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+	addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if
 
 // Load header here
diff --git a/modules.php b/modules.php
index 796b1e8128..5dcf9f06cf 100644
--- a/modules.php
+++ b/modules.php
@@ -76,7 +76,7 @@ $check = 'failed';
 // Is the maintenance mode active or goes all well?
 if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (getModule() != 'admin')) {
 	// Maintain mode is active and you are no admin
-	addFatalMessage(__FILE__, __LINE__, getMessage('MAILER_DOWN_FOR_MAINTENANCE'));
+	addFatalMessage(__FILE__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
 } elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
 	// Construct module name
 	$GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
@@ -133,7 +133,7 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 	} // END - switch
 } elseif (!ifFatalErrorsDetected()) {
 	// MySQL problems detected
-	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+	addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {
-- 
2.39.5