diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index 9357a551e0..f203a05219 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -796,10 +796,11 @@ class CmdEmote(RPCommand):  # replaces the main emote
             self.caller.msg("What do you want to do?")
         else:
             # we also include ourselves here.
-            emote = self.args
+            emote = self.args.replace('{', '{{')  # Escape open curly brace in later formatting.
+            emote = emote.replace('}', '}}')  # Also escape close curly brace.
             targets = self.caller.location.contents
-            if not emote.endswith((".", "!")):
-                emote = "%s." % emote
+            if not emote.endswith((".", "?", "!")):  # If emote is not punctuated,
+                emote = "%s." % emote  # add a full-stop for good measure.
             send_emote(self.caller, targets, emote, anonymous_add='first')