1 files changed, 17 insertions, 3 deletions
diff --git a/src/modules.c b/src/modules.c
index 7321c43b9..fede2de3c 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1054,10 +1054,24 @@ Message *findMessage(MessageHash * msgTable[], const char *name)
     idx = CMD_HASH(name);
 
     for (current = msgTable[idx]; current; current = current->next) {
-        if (stricmp(name, current->name) == 0) {
-            return current->m;
+ 	if (UseTokens) {
+ 	 if (ircd->tokencaseless) {
+	  if (stricmp(name, current->name) == 0) {
+	    return current->m;
+	  }
+	 }
+ 	 else {
+	   if (strcmp(name, current->name) == 0) {
+	        return current->m;
+ 	   }
+         }
+	}
+	else {
+         if (stricmp(name, current->name) == 0) {
+             return current->m;
+         }
         }
-    }
+     }
     return NULL;
 }