diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 9555ee2cd6..16f8cfacba 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2137,6 +2137,9 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
 	}
 	getChild<LLCheckBoxCtrl>("send_im_to_email")->setLabelArg("[EMAIL]", display_email);
 	// </FS:Ansariel> Show email address in preferences (FIRE-1071)
+
+	// <FS:Ansariel> FIRE-420: Show end of last conversation in history
+	getChildView("LogShowHistory")->setEnabled(TRUE);
 }
 
 void LLFloaterPreference::onUpdateSliderText(LLUICtrl* ctrl, const LLSD& name)
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 17eef362e1..3fe5d57251 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -34,8 +34,7 @@
 			<check_box label="IMs per Email zuschicken, wenn ich offline bin ([EMAIL])" name="send_im_to_email"/>
 			<check_box label="V1-Stil für IM- und Text-Chatverlauf verwenden" name="plain_text_chat_history"/>
 			<check_box label="Miniaturicons anzeigen, falls V2/3-Chat-Stil verwendet wird" name="ShowChatMiniIcons"/>	
-			<check_box label="Zeitstempel im lokalen Chat verbergen" name="hide_timestamps_nearby_chat"/>
-			<check_box label="Zeitstempel in IM's verbergen" name="hide_timestamps_im"/>
+			<check_box label="Ende der letzten Konversation anzeigen" name="LogShowHistory"/>
 			<check_box label="Blasen-Chat" name="bubble_text_chat"/>
 			<check_box label="Eingabe-Indikator in Blase oberhalb eines Avatars anzeigen" name="bubble_text_typing"/>
 			<text name="inworld_typing_rg_label" width="115">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 85baeb58b6..c617eff6a3 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -253,6 +253,16 @@
              name="ShowChatMiniIcons"
              top_pad="1"
              width="400" />
+             <check_box
+             enabled="false"
+             control_name="LogShowHistory"
+             height="16"
+             initial_value="true"
+             label="Show the end of last conversation"
+             layout="topleft"
+             name="LogShowHistory"
+             top_pad="1"
+             width="400" />
             <check_box
              control_name="UseChatBubbles"
              follows="left|top"