diff --git a/discord/client.py b/discord/client.py
index 64ceb8c9c..ed87c0e61 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -206,7 +206,7 @@ class Client:
         if isinstance(mentions, list):
             return [user.id for user in mentions]
         elif mentions == True:
-            return re.findall(r'<@(\d+)>', content)
+            return re.findall(r'<@([0-9]+)>', content)
         else:
             return []
 
diff --git a/discord/message.py b/discord/message.py
index f4ff05860..f259032d7 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -132,7 +132,7 @@ class Message(object):
         This allows you receive the user IDs of mentioned users
         even in a private message context.
         """
-        return re.findall(r'<@(\d+)>', self.content)
+        return re.findall(r'<@([0-9]+)>', self.content)
 
     @utils.cached_property
     def raw_channel_mentions(self):
@@ -142,7 +142,7 @@ class Message(object):
         This allows you receive the channel IDs of mentioned users
         even in a private message context.
         """
-        return re.findall(r'<#(\d+)>', self.content)
+        return re.findall(r'<#([0-9]+)>', self.content)
 
     def _handle_upgrades(self, channel_id):
         self.server = None