diff --git a/media/css/batucada.css b/media/css/batucada.css
index a87bc91..d58ad7b 100644
--- a/media/css/batucada.css
+++ b/media/css/batucada.css
@@ -1205,7 +1205,16 @@ header {}
 			position: absolute;
 			right: -12px; top: 0;
 			background: transparent url(/media/images/modal-nav-arrow.png) right top no-repeat;
-		}	
+		}
+/* INBOX / MESSAGING */
+#inbox{}
+#inbox #mailboxes,
+#inbox #conversations{
+	list-style: none;
+	margin: 0 0 1em; padding: 0;
+	font-size: 14px;
+	line-height: 1.6;
+	}
 /* SPLASH PAGE FOR ANON USERS */		
 #splash{}
 #splash #masthead{
diff --git a/templates/drumbeatmail/inbox.html b/templates/drumbeatmail/inbox.html
index 94a760b..cf17a5f 100644
--- a/templates/drumbeatmail/inbox.html
+++ b/templates/drumbeatmail/inbox.html
@@ -9,9 +9,7 @@
     <a href="{% locale_url drumbeatmail_inbox %}">{{ _('Inbox') }}</a>
   </nav>
   <div id="project-actions"> <!-- TODO: reusing div#id -->
-    <div id="create-message" class="button">
-      <a class="submit-button" href="{% locale_url drumbeatmail_compose %}">{{ _('New Private Discussion') }}</a>
-    </div>
+      <a id="create-message" class="button" href="{% locale_url drumbeatmail_compose %}">{{ _('New Private Discussion') }}</a>
   </div>
 </div>
 {% endblock %}
@@ -23,16 +21,13 @@
   </div>
 
   <div class="panel">
-    <ul>
+    <ul id="mailboxes">
       <li><a href="{% locale_url drumbeatmail_inbox %}">{{ _('All Messages') }}{% if messages_inbox_count > 0 %} ({{ messages_inbox_count }}){% endif %}</a></li>
-    </ul>
-
-    <ul>
       <li><a href="{% locale_url drumbeatmail_outbox %}">{{ _('Sent') }}</a></li>
     </ul>
 
     {% if senders %}
-      <ul>
+      <ul id="conversations">
 	{% for sender, count in senders %}
 	  <li><a href="{% locale_url drumbeatmail_inbox_filtered filter=sender.username %}">{{ sender.name }} ({{ count }})</a></li>
 	{% endfor %}