diff --git a/modules/data/webadmin/tmpl/add_edit_network.tmpl b/modules/data/webadmin/tmpl/add_edit_network.tmpl
index 8bfe8abc..fa392921 100644
--- a/modules/data/webadmin/tmpl/add_edit_network.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_network.tmpl
@@ -133,7 +133,7 @@
 					<div class="inputlabel">Strip Controls:</div>
 					<div class="checkbox">
 						<input type="checkbox" name="stripcontrols" id="stripcontrols_checkbox"
-							   title="Strips control codes (Colors, Bold, ..) from channel messages."
+							   title="Strips control codes (Colors, Bold, ..) from channel and private messages."
 							<? IF StripControls ?>checked="checked"<? ENDIF ?> />
 						<label for="stripcontrols_checkbox">Enabled</label>
 					</div>
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index 7af0bb0d..a51db0f4 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -685,6 +685,10 @@ void CIRCSock::ReadLine(const CString& sData) {
 				sMsg.RightChomp();
 
 				if (sTarget.Equals(GetNick())) {
+					if (m_pNetwork->StripControls()) {
+						sMsg.StripControls();
+					}
+
 					if (OnCTCPReply(Nick, sMsg)) {
 						return;
 					}
@@ -694,6 +698,10 @@ void CIRCSock::ReadLine(const CString& sData) {
 				return;
 			} else {
 				if (sTarget.Equals(GetNick())) {
+					if (m_pNetwork->StripControls()) {
+						sMsg.StripControls();
+					}
+
 					if (OnPrivNotice(Nick, sMsg)) {
 						return;
 					}
@@ -747,6 +755,10 @@ void CIRCSock::ReadLine(const CString& sData) {
 				sMsg.RightChomp();
 
 				if (sTarget.Equals(GetNick())) {
+					if (m_pNetwork->StripControls()) {
+						sMsg.StripControls();
+					}
+
 					if (OnPrivCTCP(Nick, sMsg)) {
 						return;
 					}
@@ -765,6 +777,10 @@ void CIRCSock::ReadLine(const CString& sData) {
 				return;
 			} else {
 				if (sTarget.Equals(GetNick())) {
+					if (m_pNetwork->StripControls()) {
+						sMsg.StripControls();
+					}
+
 					if (OnPrivMsg(Nick, sMsg)) {
 						return;
 					}