diff --git a/lib/PBot/Core/MessageHistory/Storage/SQLite.pm b/lib/PBot/Core/MessageHistory/Storage/SQLite.pm
index 39dd0961..6a1c50df 100644
--- a/lib/PBot/Core/MessageHistory/Storage/SQLite.pm
+++ b/lib/PBot/Core/MessageHistory/Storage/SQLite.pm
@@ -1125,8 +1125,8 @@ sub recall_message_by_text {
     my ($self, $id, $channel, $text, $ignore_command, $use_aliases) = @_;
 
     my $search = "%$text%";
-    $search =~ s/\*/%/g;
-    $search =~ s/\?/_/g;
+    $search =~ s/(?<!\\)\.?\*/%/g;
+    $search =~ s/(?<!\\)\?/_/g;
 
     my $messages = eval {
         my $sql = 'SELECT * FROM Messages WHERE channel = ? AND msg LIKE ? ESCAPE "\" ';
diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm
index 8dd93260..56a4a4bf 100644
--- a/lib/PBot/VERSION.pm
+++ b/lib/PBot/VERSION.pm
@@ -25,8 +25,8 @@ use PBot::Imports;
 # These are set by the /misc/update_version script
 use constant {
     BUILD_NAME     => "PBot",
-    BUILD_REVISION => 4355,
-    BUILD_DATE     => "2021-08-15",
+    BUILD_REVISION => 4358,
+    BUILD_DATE     => "2021-08-19",
 };
 
 sub initialize {}