diff --git a/src/conversations.c b/src/conversations.c
index 3be3e58..cbde683 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -248,7 +248,7 @@ void content_chat_view(PATH_ARGS)
     HV* session_hv = perlify_session(ssn);
     XPUSHs(newRV_noinc((SV*)session_hv));
     XPUSHs(newRV_noinc((SV*)template_files));
-    if (chat_code)
+    if (chat_code == 0)
         XPUSHs(newRV_noinc((SV*)perlify_chat(&chat)));
     else ARG_UNDEFINED();
     if (messages)
diff --git a/templates/chat.tt b/templates/chat.tt
index d9fa3e2..ab5e16b 100644
--- a/templates/chat.tt
+++ b/templates/chat.tt
@@ -4,7 +4,10 @@
     <a href="/@[% chat.account.acct %]" class="page-header-title">[% format_username(chat.account) %]</a>
 </div>
 <div class="chat-view">
-    [% FOREACH msg IN messages %]
+    [%# I can't quite say the below is fastest or could be done inline (one eval?),
+       not the fastest but it just works %]
+    [% revmessages = messages.reverse %]
+    [% FOREACH msg IN revmessages %]
         <div class="message-container[% IF msg.account_id == ssn.account.id %] message-you[% END %]">
             <img src="
                       [%- IF msg.account_id == ssn.account.id -%]