replaced all %R with %s in the language strings

32 files changed, 110 insertions, 120 deletions

diff --git a/include/config.h b/include/config.h
index aee6f44e5..f386b1747 100644
--- a/include/config.h
+++ b/include/config.h
@@ -485,6 +485,9 @@ class CoreExport ServerConfig
 	bool UsePrivmsg;
 	/* Services only respond to full PRIVMSG client@services.server.name messages */
 	bool UseStrictPrivMsg;
+	/* This is not a configurable option.
+	 * Config::Config will set it depending on the value of UseStrictPrivMsg */
+	Anope::string UseStrictPrivMsgString;
 	/* Number of seconds between consecutive uses of the REGISTER command
 	 * Not to be confused with NSRegDelay */
 	unsigned NickRegDelay;
diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp
index 5117055a3..5acbf913f 100644
--- a/modules/core/bs_badwords.cpp
+++ b/modules/core/bs_badwords.cpp
@@ -281,7 +281,7 @@ class CommandBSBadwords : public Command
 				"Maintains the \002bad words list\002 for a channel. The bad\n"
 				"words list determines which words are to be kicked\n"
 				"when the bad words kicker is enabled. For more information,\n"
-				"type \002%R%s HELP KICK BADWORDS\002.\n"
+				"type \002%s%s HELP KICK BADWORDS\002.\n"
 				" \n"
 				"The \002BADWORDS ADD\002 command adds the given word to the\n"
 				"badword list. If SINGLE is specified, a kick will be\n"
@@ -291,8 +291,8 @@ class CommandBSBadwords : public Command
 				"will be done if a user says a word that ends with\n"
 				"\037word\037. If you don't specify anything, a kick will\n"
 				"be issued every time \037word\037 is said by a user.\n"
-				" \n"
-				"The \002BADWORDS DEL\002 command removes the given word from the\n"
+				" \n"), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
+		source.Reply(_("The \002BADWORDS DEL\002 command removes the given word from the\n"
 				"bad words list.  If a list of entry numbers is given, those\n"
 				"entries are deleted.  (See the example for LIST below.)\n"
 				" \n"
@@ -305,7 +305,7 @@ class CommandBSBadwords : public Command
 				"      7 through 9.\n"
 				" \n"
 				"The \002BADWORDS CLEAR\002 command clears all entries of the\n"
-				"bad words list."), BotServ->nick.c_str());
+				"bad words list."));
 		return true;
 	}
 
diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp
index 87e24b4f6..c2632b437 100644
--- a/modules/core/bs_help.cpp
+++ b/modules/core/bs_help.cpp
@@ -37,10 +37,11 @@ class CommandBSHelp : public Command
 				"It has been created for users that can't host or\n"
 				"configure a bot, or for use on networks that don't\n"
 				"allow user bots. Available commands are listed \n"
-				"below; to use them, type \002%R%s \037command\037\002.  For \n"
-				"more information on a specific command, type \002%R\n"
-				"%s HELP \037command\037\002."),
-				BotServ->nick.c_str(), BotServ->nick.c_str(), BotServ->nick.c_str());
+				"below; to use them, type \002%s%s \037command\037\002. For\n"
+				"more information on a specific command, type\n"
+				"\002%s%s HELP \037command\037\002."),
+				BotServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str(),
+				Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
 		for (CommandMap::const_iterator it = BotServ->Commands.begin(), it_end = BotServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || u->HasCommand(it->second->permission))
 				it->second->OnServHelp(source);
diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp
index 316b50be6..3e1902445 100644
--- a/modules/core/bs_kick.cpp
+++ b/modules/core/bs_kick.cpp
@@ -475,22 +475,22 @@ class CommandBSKick : public Command
 					"    UNDERLINES    Sets if the bot kicks underlines\n"
 					"    ITALICS       Sets if the bot kicks italics\n"
 					" \n"
-					"Type \002%R%s HELP KICK \037option\037\002 for more information\n"
+					"Type \002%s%s HELP KICK \037option\037\002 for more information\n"
 					"on a specific option.\n"
 					" \n"
 					"Note: access to this command is controlled by the\n"
-					"level SET."), ChanServ->nick.c_str());
+					"level SET."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		else if (subcommand.equals_ci("BADWORDS"))
 			source.Reply(_("Syntax: \002KICK \037#channel\037 BADWORDS {\037ON|OFF\037} [\037ttb\037]\002\n"
 					"Sets the bad words kicker on or off. When enabled, this\n"
 					"option tells the bot to kick users who say certain words\n"
 					"on the channels.\n"
 					"You can define bad words for your channel using the\n"
-					"\002BADWORDS\002 command. Type \002%R%s HELP BADWORDS\002 for\n"
+					"\002BADWORDS\002 command. Type \002%s%s HELP BADWORDS\002 for\n"
 					"more information.\n"
 					"ttb is the number of times a user can be kicked\n"
 					"before it get banned. Don't give ttb to disable\n"
-					"the ban system once activated."), ChanServ->nick.c_str());
+					"the ban system once activated."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		else if (subcommand.equals_ci("BOLDS"))
 			source.Reply(_("Syntax: \002KICK \037channel\037 BOLDS {\037ON|OFF\037} [\037ttb\037]\002\n"
 					"Sets the bolds kicker on or off. When enabled, this\n"
diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp
index 96a8c2b83..496190f75 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/core/bs_set.cpp
@@ -213,10 +213,10 @@ class CommandBSSet : public Command
 					"    SYMBIOSIS        Allow the bot to act as a real bot\n"
 					"    MSG              Configure how fantasy commands should be replied to\n"
 					" \n"
-					"Type \002%R%s HELP SET \037option\037\002 for more information\n"
+					"Type \002%s%s HELP SET \037option\037\002 for more information\n"
 					"on a specific option.\n"
 					"Note: access to this command is controlled by the\n"
-					"level SET."), BotServ->nick.c_str());
+					"level SET."), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
 			User *u = source.u;
 			if (u->IsServicesOper())
 				source.Reply(_("These options are reserved to Services Operators:\n"
diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp
index e2e2a946e..fb6aa26db 100644
--- a/modules/core/cs_access.cpp
+++ b/modules/core/cs_access.cpp
@@ -434,11 +434,11 @@ class CommandCSAccess : public Command
 			if (ModeManager::FindChannelModeByName(CMODE_HALFOP))
 				source.Reply(_("You can't use this command. \n"
 						"Use the AOP, SOP, HOP and VOP commands instead.\n"
-						"Type \002%R%s HELP \037command\037\002 for more information."), Config->s_ChanServ.c_str());
+						"Type \002%s%s HELP \037command\037\002 for more information."), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str());
 			else
 				source.Reply(_("You can't use this command. \n"
 						"Use the AOP, SOP and VOP commands instead.\n"
-						"Type \002%R%s HELP \037command\037\002 for more information."), Config->s_ChanServ.c_str());
+						"Type \002%s%s HELP \037command\037\002 for more information."), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str());
 		}
 		else if (readonly && !is_list)
 			source.Reply(_("Sorry, channel access list modification is temporarily disabled."));
@@ -470,7 +470,7 @@ class CommandCSAccess : public Command
 				"list specifies which users are allowed chanop status or\n"
 				"access to %s commands on the channel.  Different\n"
 				"user levels allow for access to different subsets of\n"
-				"privileges; \002%R%s HELP ACCESS LEVELS\002 for more\n"
+				"privileges; \002%s%s HELP ACCESS LEVELS\002 for more\n"
 				"specific information.  Any nick not on the access list has\n"
 				"a user level of 0.\n"
 				" \n"
@@ -504,7 +504,7 @@ class CommandCSAccess : public Command
 				" \n"
 				"The \002ACCESS CLEAR\002 command clears all entries of the\n"
 				"access list."),
-				ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		source.Reply(_("\002User access levels\002\n"
 				" \n"
 				"By default, the following access levels are defined:\n"
@@ -522,8 +522,8 @@ class CommandCSAccess : public Command
 				"   \002     <0\002   May not be opped.\n"
 				" \n"
 				"These levels may be changed, or new ones added, using the\n"
-				"\002LEVELS\002 command; type \002%R%s HELP LEVELS\002 for\n"
-				"information."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"\002LEVELS\002 command; type \002%s%s HELP LEVELS\002 for\n"
+				"information."), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -583,7 +583,7 @@ class CommandCSLevels : public Command
 				}
 			}
 
-			source.Reply(_("Setting \002%s\002 not known.  Type \002%R%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->s_ChanServ.c_str());
+			source.Reply(_("Setting \002%s\002 not known.  Type \002%s%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str());
 		}
 
 		return MOD_CONT;
@@ -613,7 +613,7 @@ class CommandCSLevels : public Command
 				}
 			}
 
-		source.Reply(_("Setting \002%s\002 not known.  Type \002%R%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->s_ChanServ.c_str());
+		source.Reply(_("Setting \002%s\002 not known.  Type \002%s%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str());
 
 		return MOD_CONT;
 	}
diff --git a/modules/core/cs_help.cpp b/modules/core/cs_help.cpp
index 294a26b62..a13bf7829 100644
--- a/modules/core/cs_help.cpp
+++ b/modules/core/cs_help.cpp
@@ -38,9 +38,9 @@ class CommandCSHelp : public Command
 				"malicious users from \"taking over\" channels by limiting\n"
 				"who is allowed channel operator privileges. Available\n"
 				"commands are listed below; to use them, type\n"
-				"\002%R%s \037command\037\002. For more information on a\n"
-				"specific command, type \002%R%s HELP \037command\037\002."),
-				ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str(),
+				"\002%s%s \037command\037\002. For more information on a\n"
+				"specific command, type \002%s%s HELP \037command\037\002."),
+				ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(),
 				ChanServ->nick.c_str());
 		for (CommandMap::const_iterator it = ChanServ->Commands.begin(); it != ChanServ->Commands.end(); ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || u->HasCommand(it->second->permission))
diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp
index 13aa17d35..09bcd812f 100644
--- a/modules/core/cs_register.cpp
+++ b/modules/core/cs_register.cpp
@@ -110,14 +110,14 @@ class CommandCSRegister : public Command
 			"to change all of the channel settings for the channel;\n"
 			"%s will also automatically give the founder\n"
 			"channel-operator privileges when s/he enters the channel.\n"
-			"See the \002ACCESS\002 command (\002%R%s HELP ACCESS\002) for\n"
+			"See the \002ACCESS\002 command (\002%s%s HELP ACCESS\002) for\n"
 			"information on giving a subset of these privileges to\n"
 			"other channel users.\n"
 			" \n"
 			"NOTICE: In order to register a channel, you must have\n"
 			"first registered your nickname.  If you haven't,\n"
-			"\002%R%s HELP\002 for information on how to do so."),
-			ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+			"\002%s%s HELP\002 for information on how to do so."),
+			ChanServ->nick.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp
index 15c9b8f6b..77adbe815 100644
--- a/modules/core/cs_saset.cpp
+++ b/modules/core/cs_saset.cpp
@@ -78,8 +78,8 @@ class CommandCSSASet : public Command
 					"Available options:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(_("Type \002%R%s HELP SASET \037option\037\002 for more information on a\n"
-				"particular option."), ChanServ->nick.c_str());
+			source.Reply(_("Type \002%s%s HELP SASET \037option\037\002 for more information on a\n"
+				"particular option."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 			return true;
 		}
 		else
diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp
index 631eb151c..be6147b58 100644
--- a/modules/core/cs_set.cpp
+++ b/modules/core/cs_set.cpp
@@ -82,8 +82,8 @@ class CommandCSSet : public Command
 					"Available options:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(_("Type \002%R%s HELP SET \037option\037\002 for more information on a\n"
-					"particular option."), ChanServ->nick.c_str());
+			source.Reply(_("Type \002%s%s HELP SET \037option\037\002 for more information on a\n"
+					"particular option."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 			return true;
 		}
 		else
diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp
index 3d1770e2e..90618bfac 100644
--- a/modules/core/cs_set_private.cpp
+++ b/modules/core/cs_set_private.cpp
@@ -48,8 +48,8 @@ class CommandCSSetPrivate : public Command
 		source.Reply(_("Syntax: \002%s \037channel\037 PRIVATE {ON | OFF}\002\n"
 				" \n"
 				"Enables or disables the \002private\002 option for a channel.\n"
-				"When \002private\002 is set, a \002%R%s LIST\002 will not\n"
-				"include the channel in any lists."), this->name.c_str(), ChanServ->nick.c_str());
+				"When \002private\002 is set, a \002%s%s LIST\002 will not\n"
+				"include the channel in any lists."), this->name.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_set_signkick.cpp b/modules/core/cs_set_signkick.cpp
index 82f99b6bf..3ca967af9 100644
--- a/modules/core/cs_set_signkick.cpp
+++ b/modules/core/cs_set_signkick.cpp
@@ -63,8 +63,8 @@ class CommandCSSetSignKick : public Command
 				" \n"
 				"If you use \002LEVEL\002, those who have a level that is superior \n"
 				"or equal to the SIGNKICK level on the channel won't have their \n"
-				"kicks signed. See \002%R%s HELP LEVELS\002 for more information."), this->name.c_str(),
-				ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"kicks signed. See \002%s%s HELP LEVELS\002 for more information."), this->name.c_str(),
+				ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp
index 8fd23f7f1..c832d0ca4 100644
--- a/modules/core/cs_topic.cpp
+++ b/modules/core/cs_topic.cpp
@@ -54,11 +54,11 @@ class CommandCSTopic : public Command
 				"Causes %s to set the channel topic to the one\n"
 				"specified. If \002topic\002 is not given, then an empty topic\n"
 				"is set. This command is most useful in conjunction\n"
-				"with \002SET TOPICLOCK\002. See \002%R%s HELP SET TOPICLOCK\002\n"
+				"with \002SET TOPICLOCK\002. See \002%s%s HELP SET TOPICLOCK\002\n"
 				"for more information.\n"
 				" \n"
 				"By default, limited to those with founder access on the\n"
-				"channel."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"channel."), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp
index 19dce6bd4..8c80f05d0 100644
--- a/modules/core/cs_xop.cpp
+++ b/modules/core/cs_xop.cpp
@@ -368,7 +368,7 @@ class XOPBase : public Command
 
 		if (!ci->HasFlag(CI_XOP))
 			source.Reply(_("You can't use this command. Use the ACCESS command instead.\n"
-					"Type \002%R%s HELP ACCESS\002 for more information."), Config->s_ChanServ.c_str());
+					"Type \002%s%s HELP ACCESS\002 for more information."), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str());
 		else if (cmd.equals_ci("ADD"))
 			return this->DoAdd(source, params, level);
 		else if (cmd.equals_ci("DEL"))
@@ -446,10 +446,10 @@ class CommandCSQOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."), ChanServ->nick.c_str(),
-				ChanServ->nick.c_str());
+				"\002%s%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%s%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(),
+				Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -509,9 +509,9 @@ class CommandCSAOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"\002%s%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%s%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -569,9 +569,9 @@ class CommandCSHOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"\002%s%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%s%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -630,9 +630,9 @@ class CommandCSSOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"\002%s%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%s%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -690,9 +690,9 @@ class CommandCSVOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
+				"\002%s%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%s%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/ms_help.cpp b/modules/core/ms_help.cpp
index 29b70d662..b672e06bf 100644
--- a/modules/core/ms_help.cpp
+++ b/modules/core/ms_help.cpp
@@ -40,11 +40,11 @@ class CommandMSHelp : public Command
 		for (CommandMap::const_iterator it = MemoServ->Commands.begin(), it_end = MemoServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || u->HasCommand(it->second->permission))
 				it->second->OnServHelp(source);
-		source.Reply(_("Type \002%R%s HELP \037command\037\002 for help on any of the\n"
+		source.Reply(_("Type \002%s%s HELP \037command\037\002 for help on any of the\n"
 				"above commands.\n"
 				"(*) By default, any user with at least level 10 access on a\n"
 				"    channel can read that channel's memos. This can be\n"
-				"    changed with the %s \002LEVELS\002 command."), MemoServ->nick.c_str(), Config->s_ChanServ.c_str());
+				"    changed with the %s \002LEVELS\002 command."), Config->UseStrictPrivMsgString.c_str(), MemoServ->nick.c_str(), Config->s_ChanServ.c_str());
 	}
 };
 
diff --git a/modules/core/ms_list.cpp b/modules/core/ms_list.cpp
index 768e94374..1b393688b 100644
--- a/modules/core/ms_list.cpp
+++ b/modules/core/ms_list.cpp
@@ -33,9 +33,9 @@ class MemoListCallback : public NumberList
 		{
 			SentHeader = true;
 			if (ci)
-				source.Reply(_("Memos for %s.  To read, type: \002%R%s READ %s \037num\037\002"), ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
+				source.Reply(_("Memos for %s. To read, type: \002%s%s READ %s \037num\037\002"), ci->name.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
 			else
-				source.Reply(_("Memos for %s.  To read, type: \002%R%s READ \037num\037\002"), source.u->nick.c_str(), Config->s_MemoServ.c_str());
+				source.Reply(_("Memos for %s. To read, type: \002%s%s READ \037num\037\002"), source.u->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str());
 
 			source.Reply(_(" Num  Sender            Date/Time"));
 		}
@@ -130,9 +130,9 @@ class CommandMSList : public Command
 					{
 						SentHeader = true;
 						if (ci)
-							source.Reply(!param.empty() ? _("New memos for %s.  To read, type: \002%R%s READ %s \037num\037\002") : _("Memos for %s. To read, type: \002%R%s READ %s \037num\037\002"), ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
+							source.Reply(!param.empty() ? _("New memos for %s.  To read, type: \002%s%s READ %s \037num\037\002") : _("Memos for %s. To read, type: \002%sR%s READ %s \037num\037\002"), ci->name.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str());
 						else
-							source.Reply(!param.empty() ? _("New memos for %s.  To read, type: \002%R%s READ \037num\037\002") : _("Memos for %s. To read, type: \002%R%s READ \037num\037\002"), u->nick.c_str(), Config->s_MemoServ.c_str());
+							source.Reply(!param.empty() ? _("New memos for %s.  To read, type: \002%s%s READ \037num\037\002") : _("Memos for %s. To read, type: \002%s%s READ \037num\037\002"), u->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str());
 						source.Reply(_(" Num  Sender            Date/Time"));
 					}
 
diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp
index 1f89c2811..632bfd056 100644
--- a/modules/core/ms_read.cpp
+++ b/modules/core/ms_read.cpp
@@ -34,9 +34,9 @@ class MemoListCallback : public NumberList
 	{
 		Memo *m = mi->memos[index];
 		if (ci)
-			source.Reply(_("Memo %d from %s (%s).  To delete, type: \002%R%s DEL %s %d\002"), index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), ci->name.c_str(), index + 1);
+			source.Reply(_("Memo %d from %s (%s).  To delete, type: \002%s%s DEL %s %d\002"), index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str(), index + 1);
 		else
-			source.Reply(_("Memo %d from %s (%s).  To delete, type: \002%R%s DEL %d\002"), index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), index + 1);
+			source.Reply(_("Memo %d from %s (%s).  To delete, type: \002%s%s DEL %d\002"), index + 1, m->sender.c_str(), do_strftime(m->time).c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), index + 1);
 		source.Reply("%s", m->text.c_str());
 		m->UnsetFlag(MF_UNREAD);
 
diff --git a/modules/core/ms_set.cpp b/modules/core/ms_set.cpp
index 82524551d..a03d6ee03 100644
--- a/modules/core/ms_set.cpp
+++ b/modules/core/ms_set.cpp
@@ -236,8 +236,8 @@ class CommandMSSet : public Command
 					"    LIMIT       Sets the maximum number of memos you can\n"
 					"                   receive\n"
 					" \n"
-					"Type \002%R%s HELP SET \037option\037\002 for more information\n"
-					"on a specific option."), MemoServ->nick.c_str());
+					"Type \002%s%s HELP SET \037option\037\002 for more information\n"
+					"on a specific option."), Config->UseStrictPrivMsgString.c_str(), MemoServ->nick.c_str());
 		else if (subcommand.equals_ci("NOTIFY"))
 			source.Reply(_("Syntax: \002SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\002\n"
 					"Changes when you will be notified about new memos:\n"
diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp
index 2cd134bd2..7127f018d 100644
--- a/modules/core/ns_drop.cpp
+++ b/modules/core/ns_drop.cpp
@@ -114,8 +114,8 @@ class CommandNSDrop : public Command
 					"your password as the \002password\002 parameter.\n"
 					" \n"
 					"In order to use this command, you must first identify\n"
-					"with your password (\002%R%s HELP IDENTIFY\002 for more\n"
-					"information)."), NickServ->nick.c_str(), NickServ->nick.c_str());
+					"with your password (\002%s%s HELP IDENTIFY\002 for more\n"
+					"information)."), NickServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 
 		return true;
 	}
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp
index 0e51ded66..e4e5fae88 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/core/ns_group.cpp
@@ -75,11 +75,11 @@ class CommandNSGroup : public Command
 		else if (na && na->nc != u->Account())
 			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
 		else if (na && Config->NSNoGroupChange)
-			source.Reply(_("Your nick is already registered; type \002%R%s DROP\002 first."), Config->s_NickServ.c_str());
+			source.Reply(_("Your nick is already registered; type \002%s%s DROP\002 first."), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 		else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
 			source.Reply(_("There are too many nicks in %s's group; list them and drop some.\n"
-					"Type \002%R%s HELP GLIST\002 and \002%R%s HELP DROP\002\n"
-					"for more information."), target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
+					"Type \002%s%s HELP GLIST\002 and \002%s%s HELP DROP\002\n"
+					"for more information."), target->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 		else
 		{
 			if ((!pass.empty() && enc_check_password(pass, target->nc->pass)) ||
@@ -156,7 +156,7 @@ class CommandNSGroup : public Command
 				"You can use this command even if you have not registered\n"
 				"your nick yet. If your nick is already registered, you'll\n"
 				"need to identify yourself before using this command. Type\n"
-				"\037%R%s HELP IDENTIFY\037 for more information. This\n"
+				"\037%s%s HELP IDENTIFY\037 for more information. This\n"
 				"last may be not possible on your IRC network.\n"
 				" \n"
 				"It is recommended to use this command with a non-registered\n"
@@ -169,7 +169,7 @@ class CommandNSGroup : public Command
 				"not possible.\n"
 				" \n"
 				"\037Note\037: all the nicknames of a group have the same password."),
-				NickServ->nick.c_str());
+				Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/ns_help.cpp b/modules/core/ns_help.cpp
index e7659a6aa..d586901f8 100644
--- a/modules/core/ns_help.cpp
+++ b/modules/core/ns_help.cpp
@@ -34,9 +34,9 @@ class CommandNSHelp : public Command
 		source.Reply(_("\002%s\002 allows you to \"register\" a nickname and\n"
 				"prevent others from using it. The following\n"
 				"commands allow for registration and maintenance of\n"
-				"nicknames; to use them, type \002%R%s \037command\037\002.\n"
+				"nicknames; to use them, type \002%s%s \037command\037\002.\n"
 				"For more information on a specific command, type\n"
-				"\002%R%s HELP \037command\037\002."), NickServ->nick.c_str(), NickServ->nick.c_str(),
+				"\002%s%s HELP \037command\037\002."), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str(),
 				NickServ->nick.c_str());
 		for (CommandMap::const_iterator it = NickServ->Commands.begin(), it_end = NickServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || u->HasCommand(it->second->permission))
@@ -45,8 +45,8 @@ class CommandNSHelp : public Command
 			source.Reply(_(" \n"
 					"Services Operators can also drop any nickname without needing\n"
 					"to identify for the nick, and may view the access list for\n"
-					"any nickname (\002%R%s ACCESS LIST \037nick\037\002)."),
-					NickServ->nick.c_str());
+					"any nickname (\002%s%s ACCESS LIST \037nick\037\002)."),
+					Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 		if (Config->NSExpire >= 86400)
 			source.Reply(_("Nicknames that are not used anymore are subject to \n"
 					"the automatic expiration, i.e. they will be deleted\n"
diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp
index 2118858f5..aa12975bd 100644
--- a/modules/core/ns_recover.cpp
+++ b/modules/core/ns_recover.cpp
@@ -104,14 +104,14 @@ class CommandNSRecover : public Command
 				"remain online for %s to ensure that the other\n"
 				"user does not immediately reconnect; after that time, you\n"
 				"can reclaim your nick.  Alternatively, use the \002RELEASE\002\n"
-				"command (\002%R%s HELP RELEASE\002) to get the nick\n"
+				"command (\002%s%s HELP RELEASE\002) to get the nick\n"
 				"back sooner.\n"
 				" \n"
 				"In order to use the \002RECOVER\002 command for a nick, your\n"
 				"current address as shown in /WHOIS must be on that nick's\n"
 				"access list, you must be identified and in the group of\n"
 				"that nick, or you must supply the correct password for\n"
-				"the nickname."), NickServ->nick.c_str(), NickServ->nick.c_str(), relstr.c_str(),
+				"the nickname."), NickServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str(), relstr.c_str(),
 				NickServ->nick.c_str());
 
 		return true;
diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp
index 6a79c89b1..36adfd471 100644
--- a/modules/core/ns_register.cpp
+++ b/modules/core/ns_register.cpp
@@ -199,7 +199,7 @@ class CommandNSRegister : public Command
 				na->nc->SetFlag(NI_UNCONFIRMED);
 				if (SendRegmail(u, na))
 				{
-					source.Reply(_("A passcode has been sent to %s, please type %R%s confirm <passcode> to confirm your email address."), email.c_str(), NickServ->nick.c_str());
+					source.Reply(_("A passcode has been sent to %s, please type %s%s confirm <passcode> to confirm your email address."), email.c_str(), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 					source.Reply(_("If you do not confirm your email address within %s your account will expire."), duration(Config->NSUnconfirmedExpire).c_str());
 				}
 			}
@@ -245,8 +245,8 @@ class CommandNSRegister : public Command
 				"that will allow you to register other nicks later sharing\n"
 				"the same configuration, the same set of memos and the\n"
 				"same channel privileges. For more information on this\n"
-				"feature, type \002%R%s HELP GROUP\002."),
-				NickServ->nick.c_str(), NickServ->nick.c_str(), NickServ->nick.c_str());
+				"feature, type \002%s%s HELP GROUP\002."),
+				NickServ->nick.c_str(), NickServ->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 		return true;
 	}
 
@@ -354,16 +354,11 @@ static bool SendRegmail(User *u, NickAlias *na)
 	Anope::string message = Anope::printf(_("Hi,\n"
 	" \n"
 	"You have requested to register the nickname %s on %s.\n"
-	"Please type \" %R%s confirm %s \" to complete registration.\n"
+	"Please type \" %s%s confirm %s \" to complete registration.\n"
 	" \n"
 	"If you don't know why this mail was sent to you, please ignore it silently.\n"
 	" \n"
-	"%s administrators."), na->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), code.c_str(), Config->NetworkName.c_str());
-
-	if (Config->UseStrictPrivMsg)
-		message = message.replace_all_cs("%R", "/");
-	else
-		message = message.replace_all_cs("%R", "/msg ");
+	"%s administrators."),  na->nick.c_str(), Config->NetworkName.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), code.c_str(), Config->NetworkName.c_str());
 
 	return Mail(u, na->nc, NickServ, subject, message);
 }
diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp
index 70c7dbb6a..8dc750f8b 100644
--- a/modules/core/ns_resetpass.cpp
+++ b/modules/core/ns_resetpass.cpp
@@ -107,7 +107,7 @@ class NSResetPass : public Module
 					na->nc->UnsetFlag(NI_UNCONFIRMED);
 					u->Identify(na);
 
-					source.Reply(_("You are now identified for your nick. Change your password using \"%R%s SET PASSWORD \002newpassword\002\" now."), Config->s_NickServ.c_str());
+					source.Reply(_("You are now identified for your nick. Change your password using \"%s%s SET PASSWORD \002newpassword\002\" now."), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 
 				}
 				else
@@ -142,16 +142,11 @@ static bool SendResetEmail(User *u, NickAlias *na)
 	"Hi,\n"
 	" \n"
 	"You have requested to have the password for %s reset.\n"
-	"To reset your password, type %R%s CONFIRM %s %s\n"
+	"To reset your password, type %s%s CONFIRM %s %s\n"
 	" \n"
 	"If you don't know why this mail was sent to you, please ignore it silently.\n"
 	" \n"
-	"%s administrators."), na->nick.c_str(), Config->s_NickServ.c_str(), na->nick.c_str(), passcode.c_str(), Config->NetworkName.c_str());
-
-	if (Config->UseStrictPrivMsg)
-		message = message.replace_all_cs("%R", "/");
-	else
-		message = message.replace_all_cs("%R", "/msg ");
+	"%s administrators."), na->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), na->nick.c_str(), passcode.c_str(), Config->NetworkName.c_str());
 
 	na->nc->Extend("ns_resetpass_code", new ExtensibleItemRegular<Anope::string>(passcode));
 	na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular<time_t>(Anope::CurTime));
diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp
index abbe5c6bc..94da56ec6 100644
--- a/modules/core/ns_saset.cpp
+++ b/modules/core/ns_saset.cpp
@@ -80,9 +80,9 @@ class CommandNSSASet : public Command
 					"Sets various nickname options. \037option\037 can be one of:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(_("Type \002%R%s HELP SASET \037option\037\002 for more information\n"
+			source.Reply(_("Type \002%s%s HELP SASET \037option\037\002 for more information\n"
 					"on a specific option. The options will be set on the given\n"
-					"\037nickname\037."), NickServ->nick.c_str());
+					"\037nickname\037."), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 			return true;
 		}
 		else
diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp
index 8c44bb81f..103cff38c 100644
--- a/modules/core/ns_set.cpp
+++ b/modules/core/ns_set.cpp
@@ -75,11 +75,11 @@ class CommandNSSet : public Command
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
 			source.Reply(_("In order to use this command, you must first identify\n"
-					"with your password (\002%R%s HELP IDENTIFY\002 for more\n"
+					"with your password (\002%s%s HELP IDENTIFY\002 for more\n"
 					"information).\n"
 					" \n"
-					"Type \002%R%s HELP SET \037option\037\002 for more information\n"
-					"on a specific option."), NickServ->nick.c_str(), NickServ->nick.c_str());
+					"Type \002%s%s HELP SET \037option\037\002 for more information\n"
+					"on a specific option."), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str(), (Config->UseStrictPrivMsg ? "/msg " : "/"), NickServ->nick.c_str());
 			return true;
 		}
 		else
diff --git a/modules/core/ns_set_email.cpp b/modules/core/ns_set_email.cpp
index 2d1d371f5..d63329f50 100644
--- a/modules/core/ns_set_email.cpp
+++ b/modules/core/ns_set_email.cpp
@@ -32,16 +32,11 @@ static bool SendConfirmMail(User *u)
 	Anope::string message = Anope::printf(_("Hi,\n"
 	" \n"
 	"You have requested to change your email address to %s.\n"
-	"Please type \" %R%s confirm %s \" to confirm this change.\n"
+	"Please type \" %s%s confirm %s \" to confirm this change.\n"
 	" \n"
 	"If you don't know why this mail was sent to you, please ignore it silently.\n"
 	" \n"
-	"%s administrators."), u->Account()->email.c_str(), Config->s_NickServ.c_str(), code.c_str(), Config->NetworkName.c_str());
-
-	if (Config->UseStrictPrivMsg)
-		message = message.replace_all_cs("%R", "/");
-	else
-		message = message.replace_all_cs("%R", "/msg ");
+	"%s administrators."), u->Account()->email.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), code.c_str(), Config->NetworkName.c_str());
 
 	return Mail(u, u->Account(), NickServ, subject, message);
 }
diff --git a/modules/core/ns_set_private.cpp b/modules/core/ns_set_private.cpp
index 6831d00e1..efcd4da09 100644
--- a/modules/core/ns_set_private.cpp
+++ b/modules/core/ns_set_private.cpp
@@ -18,7 +18,7 @@ class CommandNSSetPrivate : public Command
  public:
 	CommandNSSetPrivate(const Anope::string &spermission = "") : Command("PRIVATE", 2, 2, spermission)
 	{
-		this->SetDesc(Anope::printf(_("Prevent the nickname from appearing in a \002%R%s LIST\002"), NickServ->nick.c_str()));
+		this->SetDesc(Anope::printf(_("Prevent the nickname from appearing in a \002%s%s LIST\002"), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str()));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/src/commands.cpp b/src/commands.cpp
index 91b4787fd..01f8eb45b 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -57,7 +57,7 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
 
 	if (!c)
 	{
-		u->SendMessage(bi, _("Unknown command \002%s\002.  \"%R%s HELP\" for help."), command.c_str(), bi->nick.c_str());
+		u->SendMessage(bi, _("Unknown command \002%s\002. \"%s%s HELP\" for help."), command.c_str(), Config->UseStrictPrivMsgString.c_str(), bi->nick.c_str());
 		PopLanguage();
 		return;
 	}
diff --git a/src/config.cpp b/src/config.cpp
index e230a15b7..f75913fc9 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -147,6 +147,12 @@ ServerConfig::ServerConfig() : config_data(), NSDefFlags(NickCoreFlagStrings), C
 		}
 	}
 
+	if (UseStrictPrivMsg)
+		UseStrictPrivMsgString = "/";
+	else
+		UseStrictPrivMsgString ="/msg ";
+
+
 	if (!BSDefaults.empty())
 	{
 		spacesepstream options(BSDefaults);
diff --git a/src/memoserv.cpp b/src/memoserv.cpp
index 9869e4264..a92742864 100644
--- a/src/memoserv.cpp
+++ b/src/memoserv.cpp
@@ -59,7 +59,7 @@ void check_memos(User *u)
 	{
 		u->SendMessage(MemoServ, newcnt == 1 ? _("You have 1 new memo.") : _("You have %d new memos."), newcnt);
 		if (newcnt == 1 && (nc->memos.memos[i - 1]->HasFlag(MF_UNREAD)))
-			u->SendMessage(MemoServ, _("Type \002%R%s READ LAST\002 to read it."), Config->s_MemoServ.c_str());
+			u->SendMessage(MemoServ, _("Type \002%s%s READ LAST\002 to read it."), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str());
 		else if (newcnt == 1)
 		{
 			for (i = 0; i < end; ++i)
@@ -67,10 +67,10 @@ void check_memos(User *u)
 				if (nc->memos.memos[i]->HasFlag(MF_UNREAD))
 					break;
 			}
-			u->SendMessage(MemoServ, _("Type \002%R%s READ %d\002 to read it."), Config->s_MemoServ.c_str(), i);
+			u->SendMessage(MemoServ, _("Type \002%s%s READ %d\002 to read it."), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), i);
 		}
 		else
-			u->SendMessage(MemoServ, _("Type \002%R%s LIST NEW\002 to list them."), Config->s_MemoServ.c_str());
+			u->SendMessage(MemoServ, _("Type \002%s%s LIST NEW\002 to list them."), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str());
 	}
 	if (nc->memos.memomax > 0 && nc->memos.memos.size() >= nc->memos.memomax)
 	{
diff --git a/src/users.cpp b/src/users.cpp
index 01380f480..4d9246a14 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -236,11 +236,6 @@ void User::SendMessage(BotInfo *source, const char *fmt, ...)
 
 void User::SendMessage(BotInfo *source, Anope::string msg)
 {
-	if (Config->UseStrictPrivMsg)
-		msg = msg.replace_all_cs("%R", "/");
-	else
-		msg = msg.replace_all_cs("%R", "/msg ");
-
 	/* Send privmsg instead of notice if:
 	* - UsePrivmsg is enabled
 	* - The user is not registered and NSDefMsg is enabled
@@ -373,9 +368,9 @@ void User::Identify(NickAlias *na)
 		this->SendMessage(NickServ, _("You must now supply an e-mail for your nick.\n"
 						"This e-mail will allow you to retrieve your password in\n"
 						"case you forget it."));
-		this->SendMessage(NickServ, _("Type \002%R%s SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n"
+		this->SendMessage(NickServ, _("Type \002%s%s SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n"
 						"Your privacy is respected; this e-mail won't be given to\n"
-						"any third-party person."), NickServ->nick.c_str());
+						"any third-party person."), Config->UseStrictPrivMsgString.c_str(), NickServ->nick.c_str());
 	}
 
 	if (na->nc->HasFlag(NI_UNCONFIRMED))