diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp
index 6f8ad109c6c02fdc0860318701052118ae5551fe..06d0fb5542ae0ecab4308ac5586f51214dbee0ef 100644
--- a/indra/newview/llfloatertwitter.cpp
+++ b/indra/newview/llfloatertwitter.cpp
@@ -119,9 +119,18 @@ void LLTwitterPhotoPanel::draw()
 	{
 		int max_status_length = add_photo ? 100 : 140;
 		status_text_box->setMaxTextLength(max_status_length);
+		if (!add_photo)
+		{
+			if (mOldStatusText.length() > status_text_box->getText().length() && status_text_box->getText() == mOldStatusText.substr(0, status_text_box->getText().length()))
+			{
+				status_text_box->setText(mOldStatusText);
+			}
+			mOldStatusText = "";
+		}
 		if (status_text_box->getText().length() > max_status_length)
 		{
-			status_text_box->setText(status_text_box->getText().substr(0, max_status_length));
+			mOldStatusText = status_text_box->getText();
+			status_text_box->setText(mOldStatusText.substr(0, max_status_length));
 		}
 	}
 
diff --git a/indra/newview/llfloatertwitter.h b/indra/newview/llfloatertwitter.h
index 12e1d412106da65cc8743b99477209fdbf9dd45d..686e167b1fd4e0ca4c6cf675dac05cf47b03aa7a 100644
--- a/indra/newview/llfloatertwitter.h
+++ b/indra/newview/llfloatertwitter.h
@@ -70,6 +70,8 @@ class LLTwitterPhotoPanel : public LLPanel
 	LLUICtrl * mPhotoCheckbox;
 	LLUICtrl * mPostButton;
 	LLUICtrl* mCancelButton;
+
+	std::string mOldStatusText;
 };
 
 class LLTwitterAccountPanel : public LLPanel