diff --git a/src/colab/static/css/screen.css b/src/colab/static/css/screen.css
index 0e91354..3ee13dc 100644
--- a/src/colab/static/css/screen.css
+++ b/src/colab/static/css/screen.css
@@ -22,10 +22,6 @@ body {
     margin-left: 10px;
 }
 
-#user-menu {
-    padding-right: 20px;
-}
-
 #user-menu .wrapper {
     padding: 10px;
     white-space: nowrap;
diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html
index da910ae..99e86c8 100644
--- a/src/super_archives/templates/message-thread.html
+++ b/src/super_archives/templates/message-thread.html
@@ -109,32 +109,9 @@
   <div class="col-lg-10 col-md-10 col-sm-12">
     <ul class="unstyled-list">
     {% for email in emails %}
-      {% with email.from_address.get_absolute_url as profile_link %}
+      {% with email.from_address.user.get_absolute_url as profile_link %}
       <li>
-        <!--
-        <div class="col-lg-2 col-md-3 hidden-sm hidden-xm text-center">
-          {% if profile_link %}
-          <a href="{{ profile_link }}">
-          {% endif %}
-            <div>{% gravatar email.from_address 80 %}</div>
-            <span>{{ email.from_address.get_full_name_or_anonymous }}</span>
-          {% if profile_link %}
-          </a>
-          {% endif %}
-
-          <p>{{ email.received_time|date:"SHORT_DATETIME_FORMAT" }}</p>
-
-          <div class="plus">
-            <span>{{ email.votes_count }}</span>
-            <img title="{% trans 'Vote' %}" class="pull-right" src="{{ STATIC_URL }}img/plus.png">
-          </div>
-
-          <p class="{% if not user in email.vote_list %}hide{% endif %}">
-            <a href="#">{% trans "Remove votes" %}</a>
-          </p>
-        </div>
-        -->
-
+        {% spaceless %}
         <div class="email-message" id="msg-{{ email.id }}">
           <div class="panel panel-default">
             <div class="panel-heading clearfix">
@@ -176,6 +153,7 @@
             </div>
           </div>
         </div>
+      {% endspaceless %}
       </li>
       {% endwith %}
     {% endfor %}
--
libgit2 0.21.2