diff --git a/core/include/packet/packet_ms.h b/core/include/packet/packet_ms.h
index 0411a19..4086b60 100644
--- a/core/include/packet/packet_ms.h
+++ b/core/include/packet/packet_ms.h
@@ -13,6 +13,5 @@ class PacketMS : public AOPacket
 
   private:
     AOPacket *validateIcPacket(AOClient &client) const;
-    QRegularExpressionMatch isTestimonyJumpCommand(QString message) const;
 };
 #endif
diff --git a/core/src/packet/packet_ms.cpp b/core/src/packet/packet_ms.cpp
index b1c7942..6e63e73 100644
--- a/core/src/packet/packet_ms.cpp
+++ b/core/src/packet/packet_ms.cpp
@@ -123,14 +123,9 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
     if (l_incoming_args[4].toString().size() > ConfigManager::maxCharacters())
         return l_invalid;
 
-    // Doublepost prevention. Has to ignore blankposts and testimony commands.
     QString l_incoming_msg = client.dezalgo(l_incoming_args[4].toString().trimmed());
-    QRegularExpressionMatch match = isTestimonyJumpCommand(client.decodeMessage(l_args[4]));
-    bool msg_is_testimony_cmd = (match.hasMatch() || l_incoming_msg == ">" || l_incoming_msg == "<");
-    if (!client.m_last_message.isEmpty()           // If the last message you sent isn't empty,
-        && l_incoming_msg == client.m_last_message // and it matches the one you're sending,
-        && !msg_is_testimony_cmd)                  // and it's not a testimony command,
-        return l_invalid;                          // get it the hell outta here!
+    if (!area->lastICMessage().isEmpty() && l_incoming_msg == area->lastICMessage()[4] && l_incoming_msg != "")
+        return l_invalid;
 
     if (l_incoming_msg == "" && area->blankpostingAllowed() == false) {
         client.sendServerMessage("Blankposting has been forbidden in this area.");
@@ -413,7 +408,10 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
                 client.sendServerMessage("First statement reached.");
             }
         }
-        QRegularExpressionMatch match = isTestimonyJumpCommand(client.decodeMessage(l_args[4])); // Get rid of that pesky encoding, then do the fun part
+
+        QString l_decoded_message = client.decodeMessage(l_args[4]); // Get rid of that pesky encoding first.
+        QRegularExpression jump("(?<arrow>>)(?<int>[0,1,2,3,4,5,6,7,8,9]+)");
+        QRegularExpressionMatch match = jump.match(l_decoded_message);
         if (match.hasMatch()) {
             client.m_pos = "wit";
             int jump_idx = match.captured("int").toInt();
@@ -445,17 +443,6 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
     return PacketFactory::createPacket("MS", l_args);
 }
 
-QRegularExpressionMatch PacketMS::isTestimonyJumpCommand(QString message) const
-{
-    // *sigh* slightly too chunky and needed slightly
-    // too often to justify not making this a helper
-    // even if it hurts my heart
-    //
-    // and my grey matter
-    QRegularExpression jump("(?<arrow>>)(?<int>[0,1,2,3,4,5,6,7,8,9]+)");
-    return jump.match(message);
-}
-
 bool PacketMS::validatePacket() const
 {
     return true;