diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index 97348e11bc..fbeb05477f 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -184,6 +184,18 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the accountcode.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_type_voice";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for voice calls.";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_type_fax";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for fax calls.";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_type_text";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for text messages.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_app";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the application.";
diff --git a/app/destinations/app_languages.php b/app/destinations/app_languages.php
index 7288b093c3..a422050f31 100644
--- a/app/destinations/app_languages.php
+++ b/app/destinations/app_languages.php
@@ -621,6 +621,86 @@ $text['label-detail_action']['ru-ru'] = "Действия";
 $text['label-detail_action']['sv-se'] = "Åtgärder";
 $text['label-detail_action']['uk-ua'] = "Дії";
 
+$text['label-usage']['en-us'] = "Usage";
+$text['label-usage']['ar-eg'] = "";
+$text['label-usage']['de-at'] = "";
+$text['label-usage']['de-ch'] = "";
+$text['label-usage']['de-de'] = "";
+$text['label-usage']['es-cl'] = "";
+$text['label-usage']['es-mx'] = "";
+$text['label-usage']['fr-ca'] = "";
+$text['label-usage']['fr-fr'] = "";
+$text['label-usage']['he-il'] = "";
+$text['label-usage']['it-it'] = "";
+$text['label-usage']['nl-nl'] = "";
+$text['label-usage']['pl-pl'] = "";
+$text['label-usage']['pt-br'] = "";
+$text['label-usage']['pt-pt'] = "";
+$text['label-usage']['ro-ro'] = "";
+$text['label-usage']['ru-ru'] = "";
+$text['label-usage']['sv-se'] = "";
+$text['label-usage']['uk-ua'] = "";
+
+$text['label-voice']['en-us'] = "Voice";
+$text['label-voice']['ar-eg'] = "";
+$text['label-voice']['de-at'] = "Sprache"; //copied from de-de
+$text['label-voice']['de-ch'] = "Sprache"; //copied from de-de
+$text['label-voice']['de-de'] = "Sprache";
+$text['label-voice']['es-cl'] = "Voz";
+$text['label-voice']['es-mx'] = "Voz"; //copied from es-cl
+$text['label-voice']['fr-ca'] = "Voix"; //copied from fr-fr
+$text['label-voice']['fr-fr'] = "Voix";
+$text['label-voice']['he-il'] = "שיחה";
+$text['label-voice']['it-it'] = "Voce";
+$text['label-voice']['nl-nl'] = "";
+$text['label-voice']['pl-pl'] = "Głos";
+$text['label-voice']['pt-br'] = "Voz"; //copied from pt-pt
+$text['label-voice']['pt-pt'] = "Voz";
+$text['label-voice']['ro-ro'] = "";
+$text['label-voice']['ru-ru'] = "Голос";
+$text['label-voice']['sv-se'] = "Röst";
+$text['label-voice']['uk-ua'] = "Голос";
+
+$text['label-fax']['en-us'] = "Fax";
+$text['label-fax']['ar-eg'] = "";
+$text['label-fax']['de-at'] = "Fax"; //copied from de-de
+$text['label-fax']['de-ch'] = "Fax"; //copied from de-de
+$text['label-fax']['de-de'] = "Fax";
+$text['label-fax']['es-cl'] = "Facsímil";
+$text['label-fax']['es-mx'] = "Facsímil"; //copied from es-cl
+$text['label-fax']['fr-ca'] = "Télécopie"; //copied from fr-fr
+$text['label-fax']['fr-fr'] = "Télécopie";
+$text['label-fax']['he-il'] = "פקס";
+$text['label-fax']['it-it'] = "Fax";
+$text['label-fax']['nl-nl'] = "";
+$text['label-fax']['pl-pl'] = "Faks";
+$text['label-fax']['pt-br'] = "FAX";
+$text['label-fax']['pt-pt'] = "Fax";
+$text['label-fax']['ro-ro'] = "";
+$text['label-fax']['ru-ru'] = "Факс";
+$text['label-fax']['sv-se'] = "Fax";
+$text['label-fax']['uk-ua'] = "Факс";
+
+$text['label-text']['en-us'] = "Text";
+$text['label-text']['ar-eg'] = "";
+$text['label-text']['de-at'] = "Text"; //copied from de-de
+$text['label-text']['de-ch'] = "Text"; //copied from de-de
+$text['label-text']['de-de'] = "Text";
+$text['label-text']['es-cl'] = "Texto";
+$text['label-text']['es-mx'] = "Texto"; //copied from es-cl
+$text['label-text']['fr-ca'] = "Texte"; //copied from fr-fr
+$text['label-text']['fr-fr'] = "Texte";
+$text['label-text']['he-il'] = "טקסט";
+$text['label-text']['it-it'] = "Testo";
+$text['label-text']['nl-nl'] = "";
+$text['label-text']['pl-pl'] = "Tekst";
+$text['label-text']['pt-br'] = "Texto"; //copied from pt-pt
+$text['label-text']['pt-pt'] = "Texto";
+$text['label-text']['ro-ro'] = "";
+$text['label-text']['ru-ru'] = "Текст";
+$text['label-text']['sv-se'] = "Text";
+$text['label-text']['uk-ua'] = "Текст";
+
 $text['header-destinations']['en-us'] = "Destinations";
 $text['header-destinations']['ar-eg'] = "جهات الأتصال";
 $text['header-destinations']['de-at'] = "Ziele"; //copied from de-de
@@ -1021,6 +1101,26 @@ $text['description-account_code']['ru-ru'] = "Введите код учетно
 $text['description-account_code']['sv-se'] = "Ange 'account code'.";
 $text['description-account_code']['uk-ua'] = "Введіть код облікового запису";
 
+$text['description-usage']['en-us'] = "Set how the Destination will be used.";
+$text['description-usage']['ar-eg'] = "";
+$text['description-usage']['de-at'] = "";
+$text['description-usage']['de-ch'] = "";
+$text['description-usage']['de-de'] = "";
+$text['description-usage']['es-cl'] = "";
+$text['description-usage']['es-mx'] = "";
+$text['description-usage']['fr-ca'] = "";
+$text['description-usage']['fr-fr'] = "";
+$text['description-usage']['he-il'] = "";
+$text['description-usage']['it-it'] = "";
+$text['description-usage']['nl-nl'] = "";
+$text['description-usage']['pl-pl'] = "";
+$text['description-usage']['pt-br'] = "";
+$text['description-usage']['pt-pt'] = "";
+$text['description-usage']['ro-ro'] = "";
+$text['description-usage']['ru-ru'] = "";
+$text['description-usage']['sv-se'] = "";
+$text['description-usage']['uk-ua'] = "";
+
 $text['billing-warning']['en-us'] = "If you are using fusionpbx billing application, make sure to add accountcode and carrier variables.";
 $text['billing-warning']['ar-eg'] = "";
 $text['billing-warning']['de-at'] = "Wenn Sie die Fusionpbx Abrechnung verwenden, stellen Sie sicher, dass Account-Code und Betreiber-Variablen gesetzt sind."; //copied from de-de
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 72874e1007..7706fa6241 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -108,6 +108,9 @@
 			$currency_buy = trim($_POST["currency_buy"]);
 			$destination_record = trim($_POST["destination_record"]);
 			$destination_accountcode = trim($_POST["destination_accountcode"]);
+			$destination_type_voice = check_str($_POST["destination_type_voice"]);
+			$destination_type_fax = check_str($_POST["destination_type_fax"]);
+			$destination_type_text = check_str($_POST["destination_type_text"]);
 			$destination_carrier = trim($_POST["destination_carrier"]);
 		//convert the number to a regular expression
 			$destination_number_regex = string_to_regex($destination_number);
@@ -131,7 +134,7 @@
 			unset($_POST["db_destination_number"]);
 	}
 
-//process the http post 
+//process the http post
 	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 		//get the uuid
@@ -589,6 +592,9 @@
 					$destination["destination_context"] = $destination_context;
 					$destination["destination_record"] = $destination_record;
 					$destination["destination_accountcode"] = $destination_accountcode;
+					$destination["destination_type_voice"] = $destination_type_voice ? 1 : null;
+					$destination["destination_type_fax"] = $destination_type_fax ? 1 : null;
+					$destination["destination_type_text"] = $destination_type_text ? 1 : null;
 					$destination["destination_app"] = $destination_app;
 					$destination["destination_data"] = $destination_data;
 					$destination["destination_alternate_app"] = $destination_alternate_app;
@@ -697,6 +703,9 @@
 				$destination_cid_name_prefix = $row["destination_cid_name_prefix"];
 				$destination_record = $row["destination_record"];
 				$destination_accountcode = $row["destination_accountcode"];
+				$destination_type_voice = $row["destination_type_voice"];
+				$destination_type_fax = $row["destination_type_fax"];
+				$destination_type_text = $row["destination_type_text"];
 				$destination_context = $row["destination_context"];
 				$destination_app = $row["destination_app"];
 				$destination_data = $row["destination_data"];
@@ -1057,6 +1066,19 @@
 	echo $text['description-account_code']."\n";
 	echo "</td>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-usage']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<label><input type='checkbox' name='destination_type_voice' id='destination_type_voice' value='1' ".($destination_type_voice ? "checked='checked'" : null)."> ".$text['label-voice']."</label>&nbsp;\n";
+	echo "	<label><input type='checkbox' name='destination_type_fax' id='destination_type_fax' value='1' ".($destination_type_fax ? "checked='checked'" : null)."> ".$text['label-fax']."</label>&nbsp;\n";
+	echo "	<label><input type='checkbox' name='destination_type_text' id='destination_type_text' value='1' ".($destination_type_text ? "checked='checked'" : null)."> ".$text['label-text']."</label>\n";
+	echo "<br />\n";
+	echo $text['description-usage']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	if (permission_exists('destination_domain')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
diff --git a/app/messages/messages.php b/app/messages/messages.php
index d2de142d0b..e95270f6f9 100644
--- a/app/messages/messages.php
+++ b/app/messages/messages.php
@@ -42,6 +42,7 @@
 //get (from) destinations
 	$sql = "select destination_number from v_destinations ";
 	$sql .= "where domain_uuid = '".$domain_uuid."' ";
+	$sql .= "and destination_type_text = 1 ";
 	$sql .= "and destination_enabled = 'true' ";
 	$sql .= "order by destination_number asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
@@ -99,6 +100,10 @@
 	echo "		vertical-align: middle;\n";
 	echo "	}\n";
 
+	echo "	td.contact_selected {\n";
+	echo "		border-right: 5px solid ".($SESSION['theme']['table_row_border_color']['text'] != '' ? $SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5').";\n";
+	echo "	}\n";
+
 	echo "</style>\n";
 
 //new message layer
@@ -175,16 +180,17 @@
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<th width='25%'>".$text['label-contacts']."</th>\n";
-	echo "		<th width='75%'>".$text['label-messages']."</th>\n";
+	echo "		<th style='white-space: nowrap;'><nobr>".$text['label-messages']."<nobr></th>\n";
+	echo "		<th width='75%' style='text-align: right; font-weight: normal;' id='contact_current_name'></th>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
-	echo "		<td id='contacts' valign='top'>...</td>\n";
-	echo "		<td id='thread' valign='top' style='border-color: #c5d1e5; border-style: solid; border-width: 0 1px 1px 1px; padding: 15px;'>...</td>\n";
+	echo "		<td id='contacts' valign='top'><center>&middot;&middot;&middot;</center></td>\n";
+	echo "		<td id='thread' colspan='2' valign='top' style='border-left: 1px solid #c5d1e5; padding: 15px;'><center>&middot;&middot;&middot;</center></td>\n";
 	echo "	</tr>\n";
 	echo "</table>\n";
-	echo "<br /><br />";
+	echo "<input type='hidden' id='contact_current_number' value=''>\n";
 
-	//js to load messages for clicked number
+//js to load messages for clicked number
 	echo "<script>\n";
 
 	$refresh_contacts = is_numeric($_SESSION['message']['refresh_contacts']['numeric']) && $_SESSION['message']['refresh_contacts']['numeric'] > 0 ? $_SESSION['message']['refresh_contacts']['numeric'] : 10; //default (seconds)
@@ -196,7 +202,7 @@
 
 	echo "	function refresh_contacts() {\n";
 	echo "		clearTimeout(timer_contacts);\n";
-	echo "		$('#contacts').load('messages_contacts.php', function(){\n";
+	echo "		$('#contacts').load('messages_contacts.php?sel=' + $('#contact_current_number').val(), function(){\n";
 	echo "			timer_contacts = setTimeout(refresh_contacts, contacts_refresh);\n";
 	echo "		});\n";
 	echo "	}\n";
@@ -212,13 +218,17 @@
 		echo "			$('#message_text').focus();\n";
 		echo "		}\n";
 	}
+	echo "			refresh_contacts();\n";
 	echo "			timer_thread = setTimeout(refresh_thread_start, thread_refresh, number);\n";
 	echo "		});\n";
 	echo "	}\n";
 
 	echo "	function unload_thread() {\n";
 	echo "		clearTimeout(timer_thread);\n";
-	echo "		$('#thread').html('...');\n";
+	echo "		$('#thread').html('<center>&middot;&middot;&middot;</center>');\n";
+	echo "		$('#contact_current_number').val('');\n";
+	echo "		$('#contact_current_name').html('');\n";
+	echo "		refresh_contacts();\n";
 	echo "	}\n";
 
 	echo "	function refresh_thread(number, onsent) {\n";
@@ -237,7 +247,7 @@
 	echo "		});\n";
 	echo "	}\n";
 
-	//refresh controls
+//refresh controls
 	echo "	function refresh_contacts_stop() {\n";
 	echo "		clearTimeout(timer_contacts);\n";
 	echo "		document.getElementById('contacts_refresh_state').innerHTML = \"<img src='resources/images/refresh_paused.png' style='width: 16px; height: 16px; border: none; margin-top: 1px; cursor: pointer;' onclick='refresh_contacts_start();' alt='".$text['label-refresh_enable']."' title='".$text['label-refresh_enable']."'>\";\n";
@@ -262,7 +272,7 @@
 	echo "		}\n";
 	echo "	}\n";
 
-	//define form submit function
+//define form submit function
 	echo "	$('#message_new').submit(function(event) {\n";
 	echo "		event.preventDefault();\n";
 	echo "		$.ajax({\n";
@@ -273,14 +283,18 @@
 	echo "			contentType: false,\n";
 	echo "			cache: false,\n";
 	echo "			success: function(){\n";
-	echo "				document.getElementById('message_new').reset();\n";
+	echo "				if ($.isNumeric($('#message_new_to').val())) {\n";
+	echo "					$('#contact_current_number').val($('#message_new_to').val());\n";
+	echo "					load_thread($('#message_new_to').val());\n";
+	echo "				}\n";
 	echo "				$('#message_new_layer').fadeOut(400);\n";
+	echo "				document.getElementById('message_new').reset();\n";
 	echo "				refresh_contacts();\n";
 	echo "			}\n";
 	echo "		});\n";
 	echo "	});\n";
 
-	//open message media in layer
+//open message media in layer
 	echo "	function display_media(id, src) {\n";
 	echo "		$('#message_media_layer').load('message_media.php?id=' + id + '&src=' + src + '&action=display', function(){\n";
 	echo "			$('#message_media_layer').fadeIn(200);\n";
diff --git a/app/messages/messages_contacts.php b/app/messages/messages_contacts.php
index c7b5f09d4b..0a83df78f1 100644
--- a/app/messages/messages_contacts.php
+++ b/app/messages/messages_contacts.php
@@ -39,6 +39,9 @@
 	$language = new text;
 	$text = $language->get();
 
+//get selected number/contact
+	$current_contact = $_GET['sel'];
+
 //get the list
 	if (isset($_SESSION['message']['display_last']['text']) && $_SESSION['message']['display_last']['text'] != '') {
 		$array = explode(' ',$_SESSION['message']['display_last']['text']);
@@ -94,6 +97,7 @@
 				$prep_statement->execute();
 				$row = $prep_statement->fetch(PDO::FETCH_NAMED);
 				if (is_array($row) && sizeof($row) != 0) {
+					$contact[$number]['contact_uuid'] = $field['contact_uuid'];
 					$contact[$number]['contact_name_given'] = $row['contact_name_given'];
 					$contact[$number]['contact_name_family'] = $row['contact_name_family'];
 				}
@@ -131,13 +135,28 @@
 	if (is_array($numbers) && sizeof($numbers) != 0) {
 		echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		foreach($numbers as $number) {
-			echo "	<tr><td valign='top' class='".$row_style[$c]."' onclick=\"load_thread('".urlencode($number)."');\">";
-			if ($contact[$number]['contact_name_given'] != '' || $contact[$number]['contact_name_family'] != '') {
-				echo "		<i>".escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']).'</i>';
-				echo "<span style='float: right; font-size: 65%; line-height: 60%; margin-top: 5px; margin-left: 5px;'>".escape(format_phone($number)).'</span>';
+			if ($current_contact != '' && $number == $current_contact) {
+				echo "<tr><td valign='top' class='".$row_style[$c]." contact_selected' style='cursor: default;'>\n";
+				$selected = true;
 			}
 			else {
-				echo "		".escape(format_phone($number));
+				echo "<tr><td valign='top' class='".$row_style[$c]."' onclick=\"load_thread('".urlencode($number)."');\">\n";
+				$selected = false;
+			}
+			if ($contact[$number]['contact_name_given'] != '' || $contact[$number]['contact_name_family'] != '') {
+				echo "<i>".escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']).'</i>';
+				echo "<span style='float: right; font-size: 65%; line-height: 60%; margin-top: 5px; margin-left: 5px; margin-right: ".($selected ? '-4px' : '0').";'>".escape(format_phone($number)).'</span>';
+				if ($selected) {
+					$contact_name = escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']);
+					$contact_html = (permission_exists('contact_view') ? "<a href='".PROJECT_PATH."/app/contacts/contact_edit.php?id=".$contact[$number]['contact_uuid']."' target='_blank'>".$contact_name."</a>" : $contact_name)." : <a href='callto:".escape($number)."'>".escape(format_phone($number))."</a>";
+					echo "<script>$('#contact_current_name').html(\"".$contact_html."\");</script>\n";
+				}
+			}
+			else {
+				echo escape(format_phone($number));
+				if ($selected) {
+					echo "<script>$('#contact_current_name').html(\"<a href='callto:".escape($number)."'>".escape(format_phone($number))."</a>\");</script>\n";
+				}
 			}
 			echo "</td></tr>\n";
 			$c = $c == 0 ? 1 : 0;
diff --git a/app/messages/messages_thread.php b/app/messages/messages_thread.php
index 20e4fe310c..14d3d38b6e 100644
--- a/app/messages/messages_thread.php
+++ b/app/messages/messages_thread.php
@@ -149,7 +149,7 @@
 	echo "</style>\n";
 
 	if (!$refresh) {
-		echo "<div id='thread_messages' style='max-height: 400px; overflow: auto;'>\n";
+		echo "<div id='thread_messages' style='max-height: 300px; overflow: auto;'>\n";
 	}
 
 	//output messages
@@ -191,6 +191,9 @@
 			echo "<span id='thread_bottom'></span>\n";
 		}
 
+	//set current contact
+		echo "<script>$('#contact_current_number').val('".$number."');</script>\n";
+
 	if (!$refresh) {
 		echo "</div>\n";
 
@@ -208,9 +211,9 @@
 			echo "</table>\n";
 			echo "<table cellpadding='0' cellspacing='0' border='0' width='100%' style='margin-top: 15px;'>\n";
 			echo "	<tr>\n";
-			echo "		<td align='left'><input type='reset' class='btn' value='".$text['button-clear']."' onclick=\"$('#message_text').focus();\"></td>\n";
+			echo "		<td align='left' width='50%'><input type='reset' class='btn' value='".$text['button-clear']."' onclick=\"$('#message_text').focus();\"></td>\n";
 			echo "		<td align='center'><span id='thread_refresh_state'><img src='resources/images/refresh_active.gif' style='width: 16px; height: 16px; border: none; cursor: pointer;' onclick=\"refresh_thread_stop('".$number."');\" alt=\"".$text['label-refresh_pause']."\" title=\"".$text['label-refresh_pause']."\"></span></td>\n";
-			echo "		<td align='right'><input type='submit' class='btn' value='".$text['button-send']."' title=\"".$text['label-ctrl_enter']."\"></td>\n";
+			echo "		<td align='right' width='50%'><input type='submit' class='btn' value='".$text['button-send']."' title=\"".$text['label-ctrl_enter']."\"></td>\n";
 			echo "	</td>\n";
 			echo "</table>\n";
 			echo "</form>\n";