diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 8c38b0597..5a5bc6859 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -153,7 +153,6 @@ BOOL LLChatBar::postBuild()
 		mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5));
 		mInputEditor->setKeystrokeCallback(boost::bind(&LLChatBar::onInputEditorKeystroke,this));
 		mInputEditor->setFocusLostCallback(boost::bind(&LLChatBar::onInputEditorFocusLost));
-		mInputEditor->setFocusReceivedCallback(boost::bind(&LLChatBar::onInputEditorGainFocus));
 		mInputEditor->setCommitOnFocusLost( FALSE );
 		mInputEditor->setRevertOnEsc( FALSE );
 		mInputEditor->setIgnoreTab(TRUE);
@@ -637,12 +636,6 @@ void LLChatBar::onInputEditorFocusLost()
 	gAgent.stopTyping();
 }
 
-// static
-void LLChatBar::onInputEditorGainFocus()
-{
-	LLFloaterChat::setHistoryCursorAndScrollToEnd();
-}
-
 // static
 void LLChatBar::onClickSay( LLUICtrl* ctrl )
 {
diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h
index 71440d8bb..320818adf 100644
--- a/indra/newview/llchatbar.h
+++ b/indra/newview/llchatbar.h
@@ -86,7 +86,6 @@ public:
 
 	void	onInputEditorKeystroke();
 	static void	onInputEditorFocusLost();
-	static void	onInputEditorGainFocus();
 
 	void onCommitGesture(LLUICtrl* ctrl);
 
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 348b9235a..d70914202 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -333,23 +333,6 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
 	}
 }
 
-// static
-void LLFloaterChat::setHistoryCursorAndScrollToEnd()
-{
-	LLViewerTextEditor*	history_editor = LLFloaterChat::getInstance(LLSD())->getChild<LLViewerTextEditor>("Chat History Editor");
-	LLViewerTextEditor*	history_editor_with_mute = LLFloaterChat::getInstance(LLSD())->getChild<LLViewerTextEditor>("Chat History Editor with mute");
-	
-	if (history_editor) 
-	{
-		history_editor->setCursorAndScrollToEnd();
-	}
-	if (history_editor_with_mute)
-	{
-		 history_editor_with_mute->setCursorAndScrollToEnd();
-	}
-}
-
-
 //static 
 void LLFloaterChat::onClickMute(void *data)
 {
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index dcad5f632..e7711307f 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -69,8 +69,6 @@ public:
 	void updateConsoleVisibility();
 	void updateSettings();
 
-	static void setHistoryCursorAndScrollToEnd();
-	
 	// Add chat to console and history list.
 	// Color based on source, type, distance.
 	static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE);
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 7a4b11c86..bf6038807 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -468,7 +468,6 @@ BOOL LLFloaterIMPanel::postBuild()
 
 		mInputEditor = getChild<LLLineEditor>("chat_editor");
 		mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5));
-		mInputEditor->setFocusReceivedCallback( boost::bind(&LLFloaterIMPanel::onInputEditorFocusReceived, this) );
 		mFocusLostSignal = mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMPanel::setTyping, this, false));
 		mInputEditor->setKeystrokeCallback( boost::bind(&LLFloaterIMPanel::onInputEditorKeystroke, this, _1) );
 		mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) );
@@ -1028,11 +1027,6 @@ void LLFloaterIMPanel::onClickToggleActiveSpeakers(const LLSD& value)
 	childSetVisible("active_speakers_panel", !value);
 }
 
-void LLFloaterIMPanel::onInputEditorFocusReceived()
-{
-	mHistoryEditor->setCursorAndScrollToEnd();
-}
-
 void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller)
 {
 	// Deleting all text counts as stopping typing.
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index bee650d7b..5606c86db 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -97,7 +97,6 @@ public:
 	BOOL    focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
 
 	void            onFocusReceived();
-	void			onInputEditorFocusReceived();
 	void			onInputEditorKeystroke(LLLineEditor* caller);
 
 	void			onClickHistory();