diff -r 99a6889a65ec indra/llui/llurlentry.cpp
--- a/indra/llui/llurlentry.cpp	Mon Aug 08 11:13:15 2011 -0400
+++ b/indra/llui/llurlentry.cpp	Fri Aug 12 15:36:16 2011 +0300
@@ -1134,7 +1134,7 @@ std::string LLUrlEntryWorldMap::getLocat
 //
 LLUrlEntryNoLink::LLUrlEntryNoLink()
 {
-	mPattern = boost::regex("<nolink>.*</nolink>",
+	mPattern = boost::regex("<nolink>.*?</nolink>",
 							boost::regex::perl|boost::regex::icase);
 }
 
diff -r 99a6889a65ec indra/newview/skins/default/xui/en/notifications.xml
--- a/indra/newview/skins/default/xui/en/notifications.xml	Mon Aug 08 11:13:15 2011 -0400
+++ b/indra/newview/skins/default/xui/en/notifications.xml	Fri Aug 12 15:36:16 2011 +0300
@@ -6834,7 +6834,7 @@ Are you sure you want to share the follo
 
 With the following Residents:
 
-[RESIDENTS]
+&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
   <tag>confirm</tag>
 	<usetemplate
      name="okcancelbuttons"