diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index a92045a01dee57381f477b75df41c508c94a685b..05b31e1eaf805c9c74680781cc48767c0d3ce3a2 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -801,7 +801,7 @@ void LLButton::draw()
 		label_color = ll::ui::SearchableControl::getHighlightColor();
 
 	// Unselected label assignments
-	LLWString label = getCurrentLabel();
+	const LLWString& label = getCurrentLabel().getWString();
 
 	// overlay with keyboard focus border
 	if (hasFocus())
@@ -933,7 +933,7 @@ void LLButton::draw()
 	// Draw label
 	if( !label.empty() )
 	{
-		LLWStringUtil::trim(label);
+		//LLWStringUtil::trim(label);
 
 		S32 x;
 		switch( mHAlign )