diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index c392244ea7..e924912d56 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -357,6 +357,7 @@ void NACLAntiSpamRegistry::purgeAllQueues()
 		{
 			queues[queue]->purgeEntries();
 		}
+	llinfos << "AntiSpam Queues Purged" << llendl;
 }
 int NACLAntiSpamRegistry::checkGlobalEntry(LLUUID& name, U32 multiplier)
 {
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 49ec750655..cb811628ec 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -118,6 +118,7 @@
 //-TT Client LSL Bridge
 #include "fslslbridge.h"
 //-TT
+#include "NACLantispam.h"
 
 // [SL:KB] - Patch: Misc-Spellcheck | Checked: 2011-09-06 (Catznip-2.8.0a) | Added: Catznip-2.8.0a
 #include "llhunspell.h"
@@ -377,6 +378,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.BlockList",				boost::bind(&LLFloaterPreference::onClickBlockList, this));
 	mCommitCallbackRegistrar.add("Pref.Proxy",					boost::bind(&LLFloaterPreference::onClickProxySettings, this));
 	mCommitCallbackRegistrar.add("FS.ToggleSortContacts",		boost::bind(&LLFloaterPreference::onClickSortContacts, this));
+	mCommitCallbackRegistrar.add("NACL.AntiSpamUnblock",		boost::bind(&LLFloaterPreference::onClickClearSpamList, this));
 	//[ADD - Clear Settings : SJ]
 	mCommitCallbackRegistrar.add("Pref.ClearSettings",			boost::bind(&LLFloaterPreference::onClickClearSettings, this));
 	
@@ -1045,6 +1047,11 @@ void LLFloaterPreference::onClickClearSettings()
 	LLNotificationsUtil::add("FirestormClearSettingsPrompt",LLSD(), LLSD(), callback_clear_settings);
 }
 
+void LLFloaterPreference::onClickClearSpamList()
+{
+	NACLAntiSpamRegistry::purgeAllQueues(); 
+}
+
 //[FIX JIRA-1971 : SJ] Show an notify when Cookies setting change
 void LLFloaterPreference::onClickCookies()
 {
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 19c791ca37..9beed86aa0 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -158,6 +158,7 @@ public:
 	// if the quality radio buttons are changed
 	void onChangeQuality(const LLSD& data);
 	void onClickClearSettings();
+	void onClickClearSpamList();
 	//void callback_clear_settings(const LLSD& notification, const LLSD& response);
 	
 	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);