diff --git a/icons/add-square.png b/icons/add-square.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dab305aba00c115fed31e19c996d9791835f34c
GIT binary patch
literal 1164
zcmeAS@N?(olHy`uVBq!ia0y~yV2}Y}4mJh`h9chkQy3T+SkfJR9T^xl_H+M9WMyDr
zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7y?owJkxxA
z8MGJ}7&sW17=;*^85kHC85kKD+A|qgz-$HvH3kr1UciWuUBCpFm07@yV1pEvCEVJ>
zz`$gX84^(v;p=0SoS&<gn3A8As#lR)08+qUQ(;w+TacStlBiITo0C^;Rbi_HR$-M_
zYy}e5S5g2gDap1~itr6kaLzAERWQ>t&@)i7<5EyiuqjGOvkG!?gK95INwZbTC@Cqh
z($_C9FV`zK*2^zS*Eh7ZwA42+(l;{FElNq#Ew0QfNvzP#D^`XW0yD=YwK%ybv!En1
zKTiQ<Zemh?X^E|p638M27=XAlwIUN?Q(iIDTgmyk`XCv7Lp=k1Y}!gP({N}5$w0J$
z{ROej24t93KxRd1PNYj_Zfag}W`3TXk%bM|77Pi5J0TjK^K<fxf(sIpQ|%0)T9Aa$
zRfDaGz-0}R1d>LOtF8QtGE?(P5<$TRvIj#9s@_H)6sAaF4E88QG|0uxj>|?L9Mzy`
zx8u?}q&S0tfwA7x#WBQ#_iETizZM69(q7JzXHvapLRJ}k{~y#bW&C9>j(_mC@t35-
zWAzX0PRz0gCuD5ddBd?a|HRshDY28zHkD64!)JW@%<b*mvlHE|I~To}XSl8D^~V`%
zv%l8PZ%f><tg5HYqHlg8#|zdd=hCj$r0@$m98KA58`v$jCv5*#JAd9*?y~&mU*#Hq
zJQ|MVF_w5+U+Ql<u<~JEzu|?jNyb~RFnr)B2(#pII9_<qBXrv{7uA)ocNtH$ITgs{
za___cRSoCr+E(${hu#Q0S7%rf`+aNf?P8st`8N-&$($7&wKn&5^ri_1+u!<LuF>y$
zRMf%6rs;g=lZ?j%Exz8T9_KgcoaPRUJhx`ms@9A+vB^eLR9Btzl=SNQWITC~(mX4P
zw!Ia99|tbgHRXAnyl2Y~UeyEp_r)0=dH>=~`VajEOOIe_^Q{7Iemub|TGzc|D--gZ
z)Dq>wJ&Uhg^?;FucgEgeiQJ@xLYaMGSAOrC!|3Jvfy?WFmFn@<e=TA4&aV3z>{leZ
T%l9)yf^w^;tDnm{r-UW|Ns)-d

literal 0
HcmV?d00001

diff --git a/icons/subtract-square.png b/icons/subtract-square.png
new file mode 100644
index 0000000000000000000000000000000000000000..863af2262e91a56e65ed196c342b23345e275d15
GIT binary patch
literal 1093
zcmeAS@N?(olHy`uVBq!ia0y~yV2}Y}4mJh`h9chkQy3T+SkfJR9T^xl_H+M9WMyDr
zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7y?owJkxxA
z8MGJ}7&sW17=;*^85kHC85kKD+A|qgz-$HvH3kr1UciWuUBCpFm07@yV1pEvCEVJ>
zz`$gX84^(v;p=0SoS&<gn3A8As#lR)08+qUQ(;w+TacStlBiITo0C^;Rbi_HR$-M_
zYy}e5S5g2gDap1~itr6kaLzAERWQ>t&@)i7<5EyiuqjGOvkG!?gK95INwZbTC@Cqh
z($_C9FV`zK*2^zS*Eh7ZwA42+(l;{FElNq#Ew0QfNvzP#D^`XW0yD=YwK%ybv!En1
zKTiQ<Zemh?X^E|p638M27=XAlwIUN?Q(iIDTgmyk`XCv7Lp=k1Y}!gP({N}5$w0J$
z{ROej24t93KxRd1PNYj_Zfag}W`3TXk%bM|77Pi5JCQU-;L?aBfv(XxKPSH^xF9h(
z)y@!V7m^T?YLKg~{EISE^GXsy!3I)}AqG`%qYnyGq%a116e1er;%3KXqYsX1P_)}|
zrTpD{mw|!N!qdeu#Dn+kG(*3`4g#)`El(!#an71?DfAGp1yk?aY0?6D0)7m08g6}4
zoh1Cgq|7r&@nYbvsC)fR6LdCtT$5^fGBGVZz3h4Y`4dsSmN&enr5Y!n5q<Z=_}NLl
zgEQ4VjYQ{Nob<f1Q}ANeYKeTICY4wxE5ix45AFoq)#-a|{p}uWU$(>i3+{reb|v39
zzi}_8jef&^`AsXPzP>kOU&B#Dv4`tVIlS0=*V+4jy?1|%s!QOPTP9~Y%g>m97umda
z2XE7Zwd-DA4y$=?RWEh#y4eH0!u!vb%cQr4hR%J<{7$Mo?1t!-spbN^c3pm%laaZ6
z+s;Y<mMoQ8<a9l}(n{EUC71XMk7k2y;+kDaTpu`MbL3LpcBIeY+~pR&!k?2-IP#=M
w)kZ}TE75zOKg4Yk-RQ5mcI#&o-+b0zjHl1L-T%`l%MZ$Cp00i_>zopr0C16L>Hq)$

literal 0
HcmV?d00001

diff --git a/sunny.png b/icons/sunny.png
similarity index 100%
rename from sunny.png
rename to icons/sunny.png
diff --git a/index.html b/index.html
index 7f2de0f..557279e 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
   <link href="style.css" rel="stylesheet">
 </head>
 <body>
-  <div id="loader"><img src="sunny.png"></div>
+  <div id="loader"><img src="icons/sunny.png"></div>
 
   <div id="search">
     <form method="get">
diff --git a/post.js b/post.js
index 5cfdf07..d914858 100644
--- a/post.js
+++ b/post.js
@@ -23,39 +23,78 @@ class PostComponent {
     let header = this.buildPostHeader();
     div.appendChild(header);
 
+    let content = document.createElement('div');
+    content.className = 'content';
+
+    if (!this.isRoot) {
+      let edge = document.createElement('div');
+      edge.className = 'edge';
+      div.appendChild(edge);
+
+      let line = document.createElement('div');
+      line.className = 'line';
+      edge.appendChild(line);
+
+      let plus = document.createElement('img');
+      plus.className = 'plus';
+      plus.src = 'icons/subtract-square.png';
+      div.appendChild(plus);
+
+      for (let element of [edge, plus]) {
+        element.addEventListener('click', (e) => {
+          e.preventDefault();
+          this.toggleSectionFold(div);
+        });
+      }
+    }
+
     let p = document.createElement('p');
     p.innerText = this.post.text;
-    div.appendChild(p);
+    content.appendChild(p);
 
     if (this.post.embed) {
       let embed = document.createElement('p');
       embed.innerText = `[${this.post.embed.$type}]`;
-      div.appendChild(embed);
+      content.appendChild(embed);
     }
 
     let stats = this.buildStatsFooter();
-    div.appendChild(stats);
+    content.appendChild(stats);
 
     if (this.post.replies.length == 1 && this.post.replies[0].author.did == this.post.author.did) {
       let component = new PostComponent(this.post.replies[0], this.root);
       let element = component.buildElement();
       element.classList.add('flat');
-      div.appendChild(element);
+      content.appendChild(element);
     } else {
       for (let reply of this.post.replies) {
         let component = new PostComponent(reply, this.root);
-        div.appendChild(component.buildElement());
+        content.appendChild(component.buildElement());
       }
     }
 
     if (this.post.replyCount != this.post.replies.length) {
       let loadMore = this.buildLoadMoreLink()
-      div.appendChild(loadMore);
+      content.appendChild(loadMore);
     }
 
+    div.appendChild(content);
+
     return div;
   }
 
+  toggleSectionFold(div) {
+    let plus = div.querySelector('.plus');
+
+    if (div.classList.contains('collapsed')) {
+      div.classList.remove('collapsed');
+      plus.src = 'icons/subtract-square.png'
+    } else {
+      div.classList.add('collapsed');
+      plus.src = 'icons/add-square.png'
+    }
+  }
+
   timeFormatForTimestamp() {
     if (this.isRoot) {
       return { day: 'numeric', month: 'short', year: 'numeric', hour: 'numeric', minute: 'numeric' };
@@ -142,7 +181,7 @@ class PostComponent {
 
     link.addEventListener('click', (e) => {
       e.preventDefault();
-      link.innerHTML = `<img class="loader" src="sunny.png">`;
+      link.innerHTML = `<img class="loader" src="icons/sunny.png">`;
       loadThread(this.post.author.handle, this.post.id, loadMore.parentNode.parentNode);
     });
 
diff --git a/style.css b/style.css
index 9f1e65e..163717e 100644
--- a/style.css
+++ b/style.css
@@ -184,21 +184,48 @@ p.back i {
 }
 
 .post {
-  padding-left: 20px;
+  position: relative;
+  padding-left: 21px;
   margin-top: 30px;
+}
+
+.post .edge {
+  position: absolute;
+  left: -2px;
+  top: 30px;
+  bottom: 0px;
+  width: 6px;
+}
+
+.post .edge .line {
+  position: absolute;
+  left: 2px;
+  top: 0px;
+  bottom: 0px;
   border-left: 1px solid #aaa;
 }
 
-body > .post {
-  border-left: 0px;
+.post .edge:hover .line {
+  border-left: 2px solid #888;
+}
+
+.post.collapsed .line {
+  display: none;
+}
+
+.post.collapsed .content {
+  display: none;
 }
 
 .post.flat {
   padding-left: 0px;
-  border-left: 0px;
   margin-top: 25px;
 }
 
+.post.flat .line {
+  display: none;
+}
+
 .post .avatar {
   width: 32px;
   height: 32px;
@@ -216,6 +243,13 @@ body > .post {
   margin-right: 8px;
 }
 
+.post .plus {
+  position: absolute;
+  top: 8px;
+  left: -6px;
+  width: 14px;
+}
+
 .post h2 {
   font-size: 12pt;
   margin-bottom: 0;