diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties
index 47fdf3d40a5..a2c745e81d4 100644
--- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties
+++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties
@@ -14,7 +14,7 @@
 # David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
 ###############################################################################
 
-# NLS_MESSAGEFORMAT_NONE
+# NLS_MESSAGEFORMAT_VAR
 # NLS_ENCODING=UTF-8
 
 
diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties
index ff74a1c187b..24c82c799b9 100644
--- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties
+++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties
@@ -10,7 +10,7 @@
 # David McKnight   (IBM)        - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
 ###############################################################################
 
-# NLS_MESSAGEFORMAT_NONE
+# NLS_MESSAGEFORMAT_VAR
 # NLS_ENCODING=UTF-8
 
 #TEAM VIEW PROPERTIES
@@ -145,8 +145,8 @@ MSG_VALIDATE_COMPILESTRING_NOTVALID_DETAILS = The given string is not a valid co
 
 MSG_UDA_LOAD_ERROR = Error occurred while loading the user-defined action information from file: {0}
 
-MSG_UDA_ROOTTAG_ERROR = The xml file '{0}' appears to be corrupted. It has been replaced
-MSG_UDA_ROOTTAG_ERROR_DETAILS=Expected root tag to be named '{0}'. The corrupted file has been renamed to '{1}' and a new file created for you
+MSG_UDA_ROOTTAG_ERROR = The xml file ''{0}'' appears to be corrupted. It has been replaced
+MSG_UDA_ROOTTAG_ERROR_DETAILS=Expected root tag to be named ''{0}''. The corrupted file has been renamed to ''{1}'' and a new file created for you
 
 MSG_CONFIRM_DELETE_USERACTION = Delete selected user actions?
 MSG_CONFIRM_DELETE_USERACTION_DETAILS=This is a permanent deletion of the selected actions and cannot be undone.Select Yes to delete and No to cancel the delete action