diff --git a/rocketchat-reporting b/rocketchat-reporting
index 57753a398cf64f4bf854e566adb6c7425dea5986..7d7e7a4079a3d9af7f4f3409978976ee9706a13c 100644
--- a/rocketchat-reporting
+++ b/rocketchat-reporting
@@ -14,10 +14,7 @@ def main():
 {{ reporter[0].username|d("<unknown>") }} sent a new report about a message from the user {{ report.message.u.username|d("<unknown>") }} .
 
 Time: {{ report.ts }}
-URL to message:
-    If channel: {{ baseurl }}/channel/{{ report.message.rid }}?msg={{ report.message._id }}
-    If group: {{ baseurl }}/group/{{ report.message.rid }}?msg={{ report.message._id }}
-    If dm: {{ baseurl }}/direct/{{ report.message.rid }}?msg={{ report.message._id }}
+URL to message: {{ baseurl }}/{{ room_type }}/{{ room_name }}?msg={{ report.message._id }}
 
 -- description --
 {{ report.description|d("<none>")|indent(first=true) }}
@@ -36,8 +33,14 @@ URL to message:
 	db = client.rocketchat
 	reports = db.get_collection('rocketchat_reports').find({})
 
+	ROOM_TYPES = {"c": "channel", "d": "direct", "p": "group"}
+
 	for report in reports:
 		reporter = db.get_collection('users').find({'_id': report.get('userId')})
+		room = db.get_collection("rocketchat_room").find_one({"_id": report.get("message").get("rid")})
+		room_type = ROOM_TYPES.get(room.get("t"))
+		room_name = room.get("name")
+
 		msg = EmailMessage()
 		msg['Message-ID'] = make_msgid()
 		msg['Date'] = formatdate(localtime = 1)