diff --git a/doc/contributions.txt b/doc/contributions.txt
index dfbccb5a6c9147218f9650bf8257610f08e7cba6..c837fdd46875b5ce7a1ad79166ed3c4e3d71fd0b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -440,6 +440,7 @@ Jonathan Yap
 	STORM-1095
 	STORM-1236
 	STORM-1259
+	STORM-899
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index 84c560639e00961b568c25f1a92f03f039ecfc00..9a30979b9b12c4edda26e38f2d209db2a7cc15eb 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -296,7 +296,7 @@ LLCOFWearables::~LLCOFWearables()
 // virtual
 BOOL LLCOFWearables::postBuild()
 {
-	mAttachments = getChild<LLFlatListView>("list_attachments");
+	mAttachments = getChild<LLFlatListViewEx>("list_attachments");
 	mClothing = getChild<LLFlatListView>("list_clothing");
 	mBodyParts = getChild<LLFlatListView>("list_body_parts");
 
@@ -317,6 +317,7 @@ BOOL LLCOFWearables::postBuild()
 	mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR);
 	mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR);
 
+	mAttachments->setNoItemsMsg(getString("no_attachments"));
 
 	mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing");
 	mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2));
diff --git a/indra/newview/llcofwearables.h b/indra/newview/llcofwearables.h
index 1f8d6d0c94efacd7a3dbd351a12e2496477c1198..271e36e87d5312f0d10ba0c75d4a30108f495f06 100644
--- a/indra/newview/llcofwearables.h
+++ b/indra/newview/llcofwearables.h
@@ -106,7 +106,7 @@ class LLCOFWearables : public LLPanel
 
 	void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu);
 
-	LLFlatListView* mAttachments;
+	LLFlatListViewEx* mAttachments;
 	LLFlatListView* mClothing;
 	LLFlatListView* mBodyParts;
 
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index f438e3d42d3f8bf2c0ce99a034529effa330e703..bbeb592e962b75fa04372bd4a4e8b6db389504b1 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -53,9 +53,6 @@
              name="list_attachments"
              top="0"
              width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8c90106b79ac06fe5aa172749327fb68528cc88..f7599c70ff27f590576147eee79b59f49c2a6430 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2092,6 +2092,8 @@ Requests name of an avatar.  When data is available the dataserver event will be
 	<string name="InvFolder Friends">Friends</string>
 	<string name="InvFolder All">All</string>
 
+	<string name="no_attachments">No attachments worn</string>
+
 	<!-- inventory FVBridge -->
 	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Buy</string>