diff --git a/src/Utils/ReplaceURLs.ts b/src/Utils/ReplaceURLs.ts
index 9d6be119..8c45acd1 100644
--- a/src/Utils/ReplaceURLs.ts
+++ b/src/Utils/ReplaceURLs.ts
@@ -1,7 +1,7 @@
 export const urlRegex =
   // eslint-disable-next-line no-useless-escape
   /(^| )(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(:[0-9]{1,10})?(\/.*)?$/gm
-export const mailRegex = /([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)/gi
+export const mailRegex = /(?<![[(])([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6})(?![\])])/gi
 
 export function fixUrls(message: string): string {
   message = message.replace(urlRegex, function (url) {