diff --git a/osmtm/templates/message.mako b/osmtm/templates/message.mako
index 56521cdd..c789d557 100644
--- a/osmtm/templates/message.mako
+++ b/osmtm/templates/message.mako
@@ -17,7 +17,8 @@
     <strong>${message.subject|n}</strong>
   </p>
   <p class="text-muted">
-    ${_('From:')} ${message.from_user.username}<br>
+    ${_('From:')} <a href=${request.route_path('user',username=message.from_user.username)}>
+      ${message.from_user.username}</a><br>
     <em title="${message.date}Z" class="timeago small"></em>
   </p>
   <p>
diff --git a/osmtm/templates/user.messages.mako b/osmtm/templates/user.messages.mako
index 93a84ef3..193f951c 100644
--- a/osmtm/templates/user.messages.mako
+++ b/osmtm/templates/user.messages.mako
@@ -19,7 +19,8 @@ import bleach
     <tbody>
       % for message in messages:
       <tr class="${'unread' if message.read != True else ''}">
-        <td>${message.from_user.username}</td>
+        <td><a href=${request.route_path('user',username=message.from_user.username)}>
+          ${message.from_user.username}</a></td>
         <td>
           <a href="${request.route_path('message_read', message=message.id)}">
             ${bleach.clean(message.subject, [], strip=True)|n}