diff --git a/README.md b/README.md
index 5565cfc..79db3d8 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ is on implementing missing features.
 - Twitter "Cards" (link previews)
 - Nitter link previews
 - Search (+ hashtag search)
-- Emoji support
+- Emoji support (WIP, needs font)
 - Twitter polls
 - Server configuration
 - Simple account system with feed (excludes retweets)
diff --git a/src/views/tweet.nimf b/src/views/tweet.nimf
index 362adb5..a060bea 100644
--- a/src/views/tweet.nimf
+++ b/src/views/tweet.nimf
@@ -117,9 +117,10 @@
 </div>
 #end proc
 #
-#proc renderTweet*(tweet: Tweet; class=""): string =
-#if class.len > 0:
-<div class="${class}">
+#proc renderTweet*(tweet: Tweet; class=""; last=false): string =
+#var divClass = if last: "thread-last " & class else: class
+#if divClass.len > 0:
+<div class="${divClass}">
 #end if
 <div class="status-el">
   <div class="status-body">
@@ -139,7 +140,7 @@
     ${renderStats(tweet)}
   </div>
 </div>
-#if class.len > 0:
+#if divClass.len > 0:
 </div>
 #end if
 #end proc
diff --git a/src/views/user.nimf b/src/views/user.nimf
index 6be21c5..a85c7cb 100644
--- a/src/views/user.nimf
+++ b/src/views/user.nimf
@@ -113,15 +113,14 @@
       #end for
     </div>
     #end if
-    #let afterClass = if conversation.after.len > 0: "thread" else: ""
     <div class="main-tweet">
+      #let afterClass = if conversation.after.len > 0: "thread" else: ""
       ${renderTweet(conversation.tweet, class=afterClass)}
     </div>
     #if conversation.after.len > 0:
     <div class="after-tweet">
       #for i, tweet in conversation.after:
-      #let class = if i == conversation.after.high: "thread-last" else: ""
-      ${renderTweet(tweet, class=class)}
+      ${renderTweet(tweet, last=(i == conversation.after.high))}
       #end for
     </div>
     #end if
@@ -131,8 +130,7 @@
     #for thread in conversation.replies:
     <div class="reply thread">
       #for i, tweet in thread:
-      #let class = if i == thread.high: "thread-last" else: ""
-      ${renderTweet(tweet, class=class)}
+      ${renderTweet(tweet, last=(i == thread.high))}
       #end for
     </div>
     #end for