diff --git a/src/Discord.Net/Helpers/Mention.cs b/src/Discord.Net/Helpers/Mention.cs
index 127c5ffa2..a857841b2 100644
--- a/src/Discord.Net/Helpers/Mention.cs
+++ b/src/Discord.Net/Helpers/Mention.cs
@@ -28,16 +28,16 @@ namespace Discord
 				if (user != null)
 					return '@' + user.Name;
 				else //User not found
-					return e.Value;
+					return '@' + e.Value;
 			}));
 			text = _channelRegex.Replace(text, new MatchEvaluator(e =>
 			{
 				string id = e.Value.Substring(2, e.Value.Length - 3);
 				var channel = client.Channels[id];
 				if (channel != null && channel.Server.Id == server.Id)
-					return channel.Name;
+					return '#' + channel.Name;
 				else //Channel not found
-					return e.Value;
+					return '#' + e.Value;
 			}));
 			return text;
 		}