diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index d8a4340254df3dbef22091c7dee14b146f3489c7..27edc8148efc638062c5d43063048263b98f0c6c 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1880,7 +1880,7 @@ void move_items_to_folder(const LLUUID& new_cat_uuid, const uuid_vec_t& selected
         else
         {
             LLInventoryCategory* inv_cat = gInventory.getCategory(*it);
-            if (inv_cat)
+            if (inv_cat && !LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
             {
                 gInventory.changeCategoryParent((LLViewerInventoryCategory*)inv_cat, new_cat_uuid, false);
             }
@@ -2646,7 +2646,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
         if (selected_uuid_set.size() == 1)
         {
             LLInventoryCategory* inv_cat = gInventory.getCategory(*ids.begin());
-            if (!inv_cat)
+            if (!inv_cat || LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
             {
                 return;
             }
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0a3826123c3b032843046865bfbbcde8d0ce719e..1ee0d9c64a121648508492e3bcabe8247ab81859 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11663,7 +11663,7 @@ This Region does not support environmental settings.
  
   <notification
    icon="alertmodal.tga"
-   label="Save Outfit"
+   label="Save Environmental Settings"
    name="SaveSettingAs"
    type="alertmodal">
     <unique/>
@@ -11844,7 +11844,7 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB
 
   <notification
    icon="alertmodal.tga"
-   label="Save Outfit"
+   label="Create subfolder"
    name="CreateSubfolder"
    type="alertmodal">
     <unique/>