diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ce68dd8938..3b0d5f3a76 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-22  Junichi Satoh  <junichi@rworks.jp>
+
+	* operation/messages/message_edit.php,
+	operation/messages/message_list.php: Changed words for sender and
+	destination.
+
 2012-05-21  Sergio Martin <sergio.martin@artica.es>
 
 	* include/javascript/pandora_alerts.js
diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php
index 59e00d7261..6f59abe9be 100644
--- a/pandora_console/operation/messages/message_edit.php
+++ b/pandora_console/operation/messages/message_edit.php
@@ -73,10 +73,10 @@ if ($read_message) {
 	$table->width = '98%';
 	$table->data = array();
 	
-	$table->data[0][0] = __('From:');
+	$table->data[0][0] = __('Sender');
 	$table->data[0][1] = $user_name.' '.__('at').' ' . ui_print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp"));
 	
-	$table->data[1][0] = __('To:');
+	$table->data[1][0] = __('Destination');
 	$table->data[1][1] = $dst_name;
 	
 	$table->data[2][0] = __('Subject');
@@ -150,7 +150,7 @@ $table->width = '98%';
 
 $table->data = array();
 
-$table->data[0][0] = __('From:');
+$table->data[0][0] = __('Sender');
 
 if (!empty($own_info['fullname'])) {
 	$table->data[0][1] = $own_info['fullname'];
@@ -158,7 +158,7 @@ if (!empty($own_info['fullname'])) {
 	$table->data[0][1] = $config['id_user'];
 }
 
-$table->data[1][0] = __('To:');
+$table->data[1][0] = __('Destination');
 
 $users_full = groups_get_users (array_keys(users_get_groups()));
 $users = array();
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index 38d3ae8416..48c9e9cc6f 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -120,9 +120,9 @@ if (empty ($messages)) {
 	
 	$table->head[0] = __('Status');
 	if ($show_sent)
-		$table->head[1] = __('To');
+		$table->head[1] = __('Destination');
 	else
-		$table->head[1] = __('From');
+		$table->head[1] = __('Sender');
 	$table->head[2] = __('Subject');
 	$table->head[3] = __('Timestamp');
 	$table->head[4] = __('Delete'). html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();');