diff --git a/app/messages/app_languages.php b/app/messages/app_languages.php
index 9918b92c41..cbaa04e31f 100644
--- a/app/messages/app_languages.php
+++ b/app/messages/app_languages.php
@@ -61,6 +61,26 @@
 		$text['title_description-message']['sv-se'] = '';
 		$text['title_description-message']['uk-ua'] = '';
 
+		$text['title-message_log']['en-us'] = 'Message Log';
+		$text['title-message_log']['ar-eg'] = '';
+		$text['title-message_log']['de-at'] = '';
+		$text['title-message_log']['de-ch'] = '';
+		$text['title-message_log']['de-de'] = '';
+		$text['title-message_log']['es-cl'] = '';
+		$text['title-message_log']['es-mx'] = '';
+		$text['title-message_log']['fr-ca'] = '';
+		$text['title-message_log']['fr-fr'] = '';
+		$text['title-message_log']['he-il'] = '';
+		$text['title-message_log']['it-it'] = '';
+		$text['title-message_log']['nl-nl'] = '';
+		$text['title-message_log']['pl-pl'] = '';
+		$text['title-message_log']['pt-br'] = '';
+		$text['title-message_log']['pt-pt'] = '';
+		$text['title-message_log']['ro-ro'] = '';
+		$text['title-message_log']['ru-ru'] = '';
+		$text['title-message_log']['sv-se'] = '';
+		$text['title-message_log']['uk-ua'] = '';
+
 		$text['label-user_uuid']['en-us'] = 'User';
 		$text['label-user_uuid']['ar-eg'] = '';
 		$text['label-user_uuid']['de-at'] = '';
@@ -255,6 +275,25 @@
 		$text['label-message']['sv-se'] = '';
 		$text['label-message']['uk-ua'] = '';
 
+		$text['label-messages']['en-us'] = 'Messages';
+		$text['label-messages']['ar-eg'] = '';
+		$text['label-messages']['de-at'] = '';
+		$text['label-messages']['de-ch'] = '';
+		$text['label-messages']['de-de'] = '';
+		$text['label-messages']['es-mx'] = '';
+		$text['label-messages']['fr-ca'] = '';
+		$text['label-messages']['fr-fr'] = '';
+		$text['label-messages']['he-il'] = '';
+		$text['label-messages']['it-it'] = '';
+		$text['label-messages']['nl-nl'] = '';
+		$text['label-messages']['pl-pl'] = '';
+		$text['label-messages']['pt-br'] = '';
+		$text['label-messages']['pt-pt'] = '';
+		$text['label-messages']['ro-ro'] = '';
+		$text['label-messages']['ru-ru'] = '';
+		$text['label-messages']['sv-se'] = '';
+		$text['label-messages']['uk-ua'] = '';
+
 		$text['label-message_direction']['en-us'] = 'Direction';
 		$text['label-message_direction']['ar-eg'] = '';
 		$text['label-message_direction']['de-at'] = '';
@@ -333,43 +372,62 @@
 		$text['label-inbound']['sv-se'] = '';
 		$text['label-inbound']['uk-ua'] = '';
 
-		$text['button-new-message']['en-us'] = 'New Message';
-		$text['button-new-message']['ar-eg'] = '';
-		$text['button-new-message']['de-at'] = '';
-		$text['button-new-message']['de-ch'] = '';
-		$text['button-new-message']['de-de'] = '';
-		$text['button-new-message']['es-mx'] = '';
-		$text['button-new-message']['fr-ca'] = '';
-		$text['button-new-message']['fr-fr'] = '';
-		$text['button-new-message']['he-il'] = '';
-		$text['button-new-message']['it-it'] = '';
-		$text['button-new-message']['nl-nl'] = '';
-		$text['button-new-message']['pl-pl'] = '';
-		$text['button-new-message']['pt-br'] = '';
-		$text['button-new-message']['pt-pt'] = '';
-		$text['button-new-message']['ro-ro'] = '';
-		$text['button-new-message']['ru-ru'] = '';
-		$text['button-new-message']['sv-se'] = '';
-		$text['button-new-message']['uk-ua'] = '';
+		$text['label-new_message']['en-us'] = 'New Message';
+		$text['label-new_message']['ar-eg'] = '';
+		$text['label-new_message']['de-at'] = '';
+		$text['label-new_message']['de-ch'] = '';
+		$text['label-new_message']['de-de'] = '';
+		$text['label-new_message']['es-mx'] = '';
+		$text['label-new_message']['fr-ca'] = '';
+		$text['label-new_message']['fr-fr'] = '';
+		$text['label-new_message']['he-il'] = '';
+		$text['label-new_message']['it-it'] = '';
+		$text['label-new_message']['nl-nl'] = '';
+		$text['label-new_message']['pl-pl'] = '';
+		$text['label-new_message']['pt-br'] = '';
+		$text['label-new_message']['pt-pt'] = '';
+		$text['label-new_message']['ro-ro'] = '';
+		$text['label-new_message']['ru-ru'] = '';
+		$text['label-new_message']['sv-se'] = '';
+		$text['label-new_message']['uk-ua'] = '';
 
-		$text['button-log']['en-us'] = 'Log';
-		$text['button-log']['ar-eg'] = '';
-		$text['button-log']['de-at'] = '';
-		$text['button-log']['de-ch'] = '';
-		$text['button-log']['de-de'] = '';
-		$text['button-log']['es-mx'] = '';
-		$text['button-log']['fr-ca'] = '';
-		$text['button-log']['fr-fr'] = '';
-		$text['button-log']['he-il'] = '';
-		$text['button-log']['it-it'] = '';
-		$text['button-log']['nl-nl'] = '';
-		$text['button-log']['pl-pl'] = '';
-		$text['button-log']['pt-br'] = '';
-		$text['button-log']['pt-pt'] = '';
-		$text['button-log']['ro-ro'] = '';
-		$text['button-log']['ru-ru'] = '';
-		$text['button-log']['sv-se'] = '';
-		$text['button-log']['uk-ua'] = '';
+		$text['label-log']['en-us'] = 'Log';
+		$text['label-log']['ar-eg'] = '';
+		$text['label-log']['de-at'] = '';
+		$text['label-log']['de-ch'] = '';
+		$text['label-log']['de-de'] = '';
+		$text['label-log']['es-mx'] = '';
+		$text['label-log']['fr-ca'] = '';
+		$text['label-log']['fr-fr'] = '';
+		$text['label-log']['he-il'] = '';
+		$text['label-log']['it-it'] = '';
+		$text['label-log']['nl-nl'] = '';
+		$text['label-log']['pl-pl'] = '';
+		$text['label-log']['pt-br'] = '';
+		$text['label-log']['pt-pt'] = '';
+		$text['label-log']['ro-ro'] = '';
+		$text['label-log']['ru-ru'] = '';
+		$text['label-log']['sv-se'] = '';
+		$text['label-log']['uk-ua'] = '';
+
+		$text['label-contacts']['en-us'] = 'Contacts';
+		$text['label-contacts']['ar-eg'] = '';
+		$text['label-contacts']['de-at'] = '';
+		$text['label-contacts']['de-ch'] = '';
+		$text['label-contacts']['de-de'] = '';
+		$text['label-contacts']['es-mx'] = '';
+		$text['label-contacts']['fr-ca'] = '';
+		$text['label-contacts']['fr-fr'] = '';
+		$text['label-contacts']['he-il'] = '';
+		$text['label-contacts']['it-it'] = '';
+		$text['label-contacts']['nl-nl'] = '';
+		$text['label-contacts']['pl-pl'] = '';
+		$text['label-contacts']['pt-br'] = '';
+		$text['label-contacts']['pt-pt'] = '';
+		$text['label-contacts']['ro-ro'] = '';
+		$text['label-contacts']['ru-ru'] = '';
+		$text['label-contacts']['sv-se'] = '';
+		$text['label-contacts']['uk-ua'] = '';
 
 		$text['label-message_date']['en-us'] = 'Date';
 		$text['label-message_date']['ar-eg'] = '';
@@ -711,4 +769,104 @@
 		$text['description-message_json']['sv-se'] = '';
 		$text['description-message_json']['uk-ua'] = '';
 
+		$text['label-refresh_pause']['en-us'] = "Pause Refresh";
+		$text['label-refresh_pause']['ar-eg'] = "";
+		$text['label-refresh_pause']['de-at'] = "Seite neu laden deaktivieren"; //copied from de-de
+		$text['label-refresh_pause']['de-ch'] = "Seite neu laden deaktivieren"; //copied from de-de
+		$text['label-refresh_pause']['de-de'] = "Seite neu laden deaktivieren";
+		$text['label-refresh_pause']['es-cl'] = "Actualizar Pausa";
+		$text['label-refresh_pause']['es-mx'] = "Actualizar Pausa"; //copied from es-cl
+		$text['label-refresh_pause']['fr-ca'] = "Pause Actualiser"; //copied from fr-fr
+		$text['label-refresh_pause']['fr-fr'] = "Pause Actualiser";
+		$text['label-refresh_pause']['he-il'] = "עצור רענון";
+		$text['label-refresh_pause']['it-it'] = "Pausa";
+		$text['label-refresh_pause']['nl-nl'] = "";
+		$text['label-refresh_pause']['pl-pl'] = "Pauzuj odświeżanie";
+		$text['label-refresh_pause']['pt-br'] = "Pausar atualização";
+		$text['label-refresh_pause']['pt-pt'] = "Pausa Atualizar";
+		$text['label-refresh_pause']['ro-ro'] = "";
+		$text['label-refresh_pause']['ru-ru'] = "Приостановить обновление";
+		$text['label-refresh_pause']['sv-se'] = "Paus Uppdatera";
+		$text['label-refresh_pause']['uk-ua'] = "пауза Оновити";
+
+		$text['label-refresh_enable']['en-us'] = "Enable Refresh";
+		$text['label-refresh_enable']['ar-eg'] = "";
+		$text['label-refresh_enable']['de-at'] = "Seite neu laden aktivieren"; //copied from de-de
+		$text['label-refresh_enable']['de-ch'] = "Seite neu laden aktivieren"; //copied from de-de
+		$text['label-refresh_enable']['de-de'] = "Seite neu laden aktivieren";
+		$text['label-refresh_enable']['es-cl'] = "Activar Actualizar";
+		$text['label-refresh_enable']['es-mx'] = "Activar Actualizar"; //copied from es-cl
+		$text['label-refresh_enable']['fr-ca'] = "Activer Actualiser"; //copied from fr-fr
+		$text['label-refresh_enable']['fr-fr'] = "Activer Actualiser";
+		$text['label-refresh_enable']['he-il'] = "אפשר רענון";
+		$text['label-refresh_enable']['it-it'] = "Riprendi";
+		$text['label-refresh_enable']['nl-nl'] = "";
+		$text['label-refresh_enable']['pl-pl'] = "Włącz odświeżanie";
+		$text['label-refresh_enable']['pt-br'] = "Habilitar atualização";
+		$text['label-refresh_enable']['pt-pt'] = "Habilitar Atualização";
+		$text['label-refresh_enable']['ro-ro'] = "";
+		$text['label-refresh_enable']['ru-ru'] = "Включить обновление";
+		$text['label-refresh_enable']['sv-se'] = "Aktivera Uppdatering";
+		$text['label-refresh_enable']['uk-ua'] = "включити Оновити";
+
+		$text['description-enter_response']['en-us'] = 'Enter Response...';
+		$text['description-enter_response']['ar-eg'] = '';
+		$text['description-enter_response']['de-at'] = '';
+		$text['description-enter_response']['de-ch'] = '';
+		$text['description-enter_response']['de-de'] = '';
+		$text['description-enter_response']['es-cl'] = '';
+		$text['description-enter_response']['es-mx'] = '';
+		$text['description-enter_response']['fr-ca'] = '';
+		$text['description-enter_response']['fr-fr'] = '';
+		$text['description-enter_response']['he-il'] = '';
+		$text['description-enter_response']['it-it'] = '';
+		$text['description-enter_response']['nl-nl'] = '';
+		$text['description-enter_response']['pl-pl'] = '';
+		$text['description-enter_response']['pt-br'] = '';
+		$text['description-enter_response']['pt-pt'] = '';
+		$text['description-enter_response']['ro-ro'] = '';
+		$text['description-enter_response']['ru-ru'] = '';
+		$text['description-enter_response']['sv-se'] = '';
+		$text['description-enter_response']['uk-ua'] = '';
+
+		$text['label-ctrl_enter']['en-us'] = 'Ctrl + Enter';
+		$text['label-ctrl_enter']['ar-eg'] = '';
+		$text['label-ctrl_enter']['de-at'] = '';
+		$text['label-ctrl_enter']['de-ch'] = '';
+		$text['label-ctrl_enter']['de-de'] = '';
+		$text['label-ctrl_enter']['es-cl'] = '';
+		$text['label-ctrl_enter']['es-mx'] = '';
+		$text['label-ctrl_enter']['fr-ca'] = '';
+		$text['label-ctrl_enter']['fr-fr'] = '';
+		$text['label-ctrl_enter']['he-il'] = '';
+		$text['label-ctrl_enter']['it-it'] = '';
+		$text['label-ctrl_enter']['nl-nl'] = '';
+		$text['label-ctrl_enter']['pl-pl'] = '';
+		$text['label-ctrl_enter']['pt-br'] = '';
+		$text['label-ctrl_enter']['pt-pt'] = '';
+		$text['label-ctrl_enter']['ro-ro'] = '';
+		$text['label-ctrl_enter']['ru-ru'] = '';
+		$text['label-ctrl_enter']['sv-se'] = '';
+		$text['label-ctrl_enter']['uk-ua'] = '';
+
+		$text['button-close']['en-us'] = 'Close';
+		$text['button-close']['ar-eg'] = '';
+		$text['button-close']['de-at'] = '';
+		$text['button-close']['de-ch'] = '';
+		$text['button-close']['de-de'] = '';
+		$text['button-close']['es-cl'] = '';
+		$text['button-close']['es-mx'] = '';
+		$text['button-close']['fr-ca'] = '';
+		$text['button-close']['fr-fr'] = '';
+		$text['button-close']['he-il'] = '';
+		$text['button-close']['it-it'] = '';
+		$text['button-close']['nl-nl'] = '';
+		$text['button-close']['pl-pl'] = '';
+		$text['button-close']['pt-br'] = '';
+		$text['button-close']['pt-pt'] = '';
+		$text['button-close']['ro-ro'] = '';
+		$text['button-close']['ru-ru'] = '';
+		$text['button-close']['sv-se'] = '';
+		$text['button-close']['uk-ua'] = '';
+
 ?>
diff --git a/app/messages/messages.php b/app/messages/messages.php
index 889edd7d03..a6a298d792 100644
--- a/app/messages/messages.php
+++ b/app/messages/messages.php
@@ -93,10 +93,10 @@
 	echo "				<form id='message_new'>\n";
 	echo "				<input type='hidden' name='message_type' value='sms'>\n";
 	echo "				<span id='message_new_container'>\n";
-	echo "					<b>New Message</b><br /><br />\n";
+	echo "					<b>".$text['label-new_message']."</b><br /><br />\n";
 	echo "					<table width='100%'>\n";
 	echo "						<tr>\n";
-	echo "							<td class='vncell'>From</td>\n";
+	echo "							<td class='vncell'>".$text['label-message_from']."</td>\n";
 	echo "							<td class='vtable'>\n";
 	if (is_array($destinations) && sizeof($destinations) != 0) {
 		echo "							<select class='formfld' name='message_from' id='message_new_from'>\n";
@@ -111,20 +111,20 @@
 	echo "							</td>\n";
 	echo "						</tr>\n";
 	echo "						<tr>\n";
-	echo "							<td class='vncell'>To</td>\n";
+	echo "							<td class='vncell'>".$text['label-message_to']."</td>\n";
 	echo "							<td class='vtable'>\n";
 	echo "								<input type='text' class='formfld' name='message_to' id='message_new_to'>\n";
 	echo "							</td>\n";
 	echo "						</tr>\n";
 	echo "						<tr>\n";
-	echo "							<td class='vncell'>Message</td>\n";
+	echo "							<td class='vncell'>".$text['label-message_text']."</td>\n";
 	echo "							<td class='vtable'>\n";
 	echo "								<textarea class='formfld' style='width: 100%; height: 80px;' name='message_text' name='message_new_text'></textarea>\n";
 	echo "							</td>\n";
 	echo "						</tr>\n";
 	/*
 	echo "						<tr>\n";
-	echo "							<td class='vncell'>Media</td>\n";
+	echo "							<td class='vncell'>".$text['label-message_media']."</td>\n";
 	echo "							<td class='vtable'>\n";
 	echo "								<input type='file' class='formfld' name='message_media' id='message_new_media'>\n";
 	echo "							</td>\n";
@@ -132,9 +132,9 @@
 	*/
 	echo "					</table>\n";
 	echo "					<center>\n";
-	echo "						<input type='reset' class='btn' style='float: left; margin-top: 15px;' value='CLEAR' onclick=\"$('#message_new').reset();\">\n";
-	echo "						<input type='button' class='btn' style='margin-top: 15px;' value='CLOSE' onclick=\"$('#message_new_layer').fadeOut(200);\">\n";
-	echo "						<input type='submit' class='btn' style='float: right; margin-top: 15px;' value='SEND' xtitle='Ctrl + Enter'>\n";
+	echo "						<input type='reset' class='btn' style='float: left; margin-top: 15px;' value='".$text['button-clear']."' onclick=\"$('#message_new').reset();\">\n";
+	echo "						<input type='button' class='btn' style='margin-top: 15px;' value='".$text['button-close']."' onclick=\"$('#message_new_layer').fadeOut(200);\">\n";
+	echo "						<input type='submit' class='btn' style='float: right; margin-top: 15px;' value='".$text['button-send']."'>\n";
 	echo "					</center>\n";
 	echo "				</span>\n";
 	echo "				</form>\n";
@@ -149,7 +149,7 @@
 	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-messages']."</b><br><br></td>\n";
 	echo "		<form method='get' action=''>\n";
 	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
-	echo "				<input type='button' class='btn' name='' alt='".$text['button-new-message']."' onclick=\"$('#message_new_layer').fadeIn(200); $('#message_new_to').focus();\" value='".$text['button-new-message']."'>\n";
+	echo "				<input type='button' class='btn' name='' alt='".$text['label-new_message']."' onclick=\"$('#message_new_layer').fadeIn(200); $('#message_new_to').focus();\" value='".$text['label-new_message']."'>\n";
 	/*
 	if (permission_exists('message_all')) {
 		if ($_GET['show'] == 'all') {
@@ -160,7 +160,7 @@
 		}
 	}
 	*/
-	echo "				<a href='messages_log.php'><input type='button' class='btn' alt=\"".$text['button-log']."\" value=\"".$text['button-log']."\"></a>\n";
+	echo "				<a href='messages_log.php'><input type='button' class='btn' alt=\"".$text['label-log']."\" value=\"".$text['label-log']."\"></a>\n";
 	/*
 	echo "				<input type='text' class='txt' style='width: 150px; margin-left: 15px;' name='search' id='search' value='".escape($search)."'>\n";
 	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
@@ -172,8 +172,8 @@
 
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
-	echo "		<th width='25%'>Contacts</th>\n";
-	echo "		<th width='75%'>Messages</th>\n";
+	echo "		<th width='25%'>".$text['label-contacts']."</th>\n";
+	echo "		<th width='75%'>".$text['label-messages']."</th>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td id='contacts' valign='top'>...</td>\n";
diff --git a/app/messages/messages_log.php b/app/messages/messages_log.php
index f62bdd202b..8c6335675c 100644
--- a/app/messages/messages_log.php
+++ b/app/messages/messages_log.php
@@ -167,7 +167,7 @@
 //show the content
 	echo "<table width='100%' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-messages']."</b><br><br></td>\n";
+	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-message_log']."</b><br><br></td>\n";
 	echo "		<form method='get' action=''>\n";
 	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
 	echo "				<a href='messages.php'><input type='button' class='btn' value='".$text['button-back']."'></a>\n";
diff --git a/app/messages/messages_thread.php b/app/messages/messages_thread.php
index 7a85c5dbef..9e6dd768be 100644
--- a/app/messages/messages_thread.php
+++ b/app/messages/messages_thread.php
@@ -59,35 +59,33 @@
 	unset ($prep_statement, $sql);
 
 //css styles
-	?>
-	<style>
-		.message-bubble {
-			display: block;
-			padding: 10px;
-			border: 1px solid;
-			margin-bottom: 10px;
-		}
+	echo "<style>\n";
+	echo "	.message-bubble {\n";
+	echo "		display: block;\n";
+	echo "		padding: 10px;\n";
+	echo "		border: 1px solid;\n";
+	echo "		margin-bottom: 10px;\n";
+	echo "	}\n";
 
-		.message-bubble-em {
-			margin-right: 10%;
-			border-radius: 0px 20px 20px 20px;
-			border-color: #cffec7;
-			background-color: #ecffe9;
-		}
+	echo "	.message-bubble-em {\n";
+	echo "		margin-right: 10%;\n";
+	echo "		border-radius: 0px 20px 20px 20px;\n";
+	echo "		border-color: #cffec7;\n";
+	echo "		background-color: #ecffe9;\n";
+	echo "	}\n";
 
-		.message-bubble-me {
-			margin-left: 10%;
-			border-radius: 20px 20px 0px 20px;
-			border-color: #cbf0ff;
-			background-color: #e5f7ff;
-		}
+	echo "	.message-bubble-me {\n";
+	echo "		margin-left: 10%;\n";
+	echo "		border-radius: 20px 20px 0px 20px;\n";
+	echo "		border-color: #cbf0ff;\n";
+	echo "		background-color: #e5f7ff;\n";
+	echo "	}\n";
 
-		.message-bubble-when {
-			font-size: 65%;
-			line-height: 60%;
-		}
-	</style>
-	<?php
+	echo "	.message-bubble-when {\n";
+	echo "		font-size: 65%;\n";
+	echo "		line-height: 60%;\n";
+	echo "	}\n";
+	echo "</style>\n";
 
 	if (!$refresh) {
 		echo "<div id='thread_messages' style='max-height: 400px; overflow: auto;'>\n";
@@ -117,12 +115,12 @@
 			echo "<input type='hidden' name='message_type' value='sms'>\n";
 			echo "<input type='hidden' name='message_from' value='".$message_from."'>\n";
 			echo "<input type='hidden' name='message_to' value='".$number."'>\n";
-			echo "<textarea class='formfld' id='message_text' name='message_text' style='width: 100%; max-width: 100%; height: 40px; border: 1px solid #cbcbcb; resize: vertical; padding: 5px 8px; margin-top: 10px;' placeholder='Enter Response...'></textarea>";
+			echo "<textarea class='formfld' id='message_text' name='message_text' style='width: 100%; max-width: 100%; height: 40px; border: 1px solid #cbcbcb; resize: vertical; padding: 5px 8px; margin-top: 10px;' placeholder=\"".$text['description-enter_response']."\"></textarea>";
 			echo "<span style='position: relative;'>\n";
 			echo "	<center>\n";
-			echo "		<input type='reset' class='btn' style='float: left; margin-top: 15px;' value='CLEAR' onclick=\"$('#message_text').focus();\">\n";
+			echo "		<input type='reset' class='btn' style='float: left; margin-top: 15px;' value='".$text['button-clear']."' onclick=\"$('#message_text').focus();\">\n";
 			echo "		<span id='thread_refresh_state'><img src='resources/images/refresh_active.gif' style='width: 16px; height: 16px; border: none; margin-top: 3px; cursor: pointer;' onclick=\"refresh_thread_stop('".$number."');\" alt=\"".$text['label-refresh_pause']."\" title=\"".$text['label-refresh_pause']."\"></span> ";
-			echo "		<input type='submit' class='btn' style='float: right; margin-top: 15px;' value='SEND' title='Ctrl + Enter'>\n";
+			echo "		<input type='submit' class='btn' style='float: right; margin-top: 15px;' value='".$text['button-send']."' title=\"".$text['label-ctrl_enter']."\">\n";
 			echo "	</center>\n";
 			echo "</span>\n";
 			echo "</form>\n";