diff --git a/app/static/js/coolfieldset.js b/app/static/js/coolfieldset.js
index c3d021fc..7f27dc6d 100644
--- a/app/static/js/coolfieldset.js
+++ b/app/static/js/coolfieldset.js
@@ -18,6 +18,7 @@
     if (!options.animation) {
       fieldset.dispatchEvent(new Event('update'));
     }
+    setCookie(`fieldset_${fieldset.id}_state`, 'collapsed', 365);
   }
 
   function showFieldsetContent(fieldset, options) {
@@ -39,6 +40,7 @@
     if (!options.animation) {
       fieldset.dispatchEvent(new Event('update'));
     }
+    setCookie(`fieldset_${fieldset.id}_state`, 'expanded', 365);
   }
 
   function doToggle(fieldset, setting) {
diff --git a/app/templates/post/add_reply.html b/app/templates/post/add_reply.html
index d1f412c6..b81454b5 100644
--- a/app/templates/post/add_reply.html
+++ b/app/templates/post/add_reply.html
@@ -6,14 +6,14 @@
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
-<script src="/static/js/coolfieldset.js?v=2"></script>
+<script src="/static/js/coolfieldset.js?v=3"></script>
 <div class="row">
     <div class="col-12 col-md-8 position-relative add_reply main_pane">
-        <fieldset class="coolfieldset mt-4"><legend class="w-auto">Original post</legend>
+        <fieldset id="post_reply_op" class="coolfieldset {{ 'collapsed' if request.cookies.get('fieldset_post_reply_op_state', 'collapsed') == 'collapsed' }} mt-3"><legend class="w-auto">Original post</legend>
             <h3>{{ post.title }}</h3>
             {{ post.body_html | safe if post.body_html else '' }}
         </fieldset>
-        <fieldset class="coolfieldset mt-4"><legend class="w-auto">Comment you are replying to</legend>
+        <fieldset id="post_reply_comment" class="coolfieldset {{ 'collapsed' if request.cookies.get('fieldset_post_reply_comment_state', 'collapsed') == 'collapsed' }} mt-4 mb-4"><legend class="w-auto">Comment you are replying to</legend>
         {{ comment.body_html | safe}}
         </fieldset>
         <div class="position-relative">
diff --git a/app/templates/post/post_edit.html b/app/templates/post/post_edit.html
index 5fb13cba..e3ebaad6 100644
--- a/app/templates/post/post_edit.html
+++ b/app/templates/post/post_edit.html
@@ -6,7 +6,7 @@
 {% from 'bootstrap/form.html' import render_form, render_field %}
 
 {% block app_content %}
-<script src="/static/js/coolfieldset.js?v=2"></script>
+<script src="/static/js/coolfieldset.js?v=3"></script>
 <div class="row">
     <div class="col-12 col-md-8 position-relative main_pane">
         {% block title %}<h1>{{ _('Edit post') }}</h1>{% endblock %}
@@ -116,7 +116,7 @@
             {{ render_field(form.tags) }}
             <small class="field_hint">{{ _('Separate each tag with a comma.') }}</small>
 
-            <fieldset id="post_more_options" class="mt-4 mb-4 coolfieldset {{ 'collapsed' if request.cookies.get('fieldset_post_more_options_state') == 'collapsed' }}">
+            <fieldset id="post_more_options" class="mt-4 mb-4 coolfieldset {{ 'collapsed' if request.cookies.get('fieldset_post_more_options_state', 'collapsed') == 'collapsed' }}">
                 <legend class="w-auto">{{ _('More options') }}</legend>
                 {{ render_field(form.notify_author) }}
                 {{ render_field(form.sticky) }}
diff --git a/app/templates/post/post_reply_edit.html b/app/templates/post/post_reply_edit.html
index 913bf471..98874f8f 100644
--- a/app/templates/post/post_reply_edit.html
+++ b/app/templates/post/post_reply_edit.html
@@ -6,15 +6,15 @@
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
-<script src="/static/js/coolfieldset.js?v=2"></script>
+<script src="/static/js/coolfieldset.js?v=3"></script>
 <div class="row">
     <div class="col-12 col-md-8 position-relative add_reply main_pane">
-        <fieldset class="coolfieldset mt-4"><legend class="w-auto">Original post</legend>
+        <fieldset id="post_reply_op" class="coolfieldset  {{ 'collapsed' if request.cookies.get('fieldset_post_reply_op_state', 'collapsed') == 'collapsed' }} mt-3"><legend class="w-auto">Original post</legend>
             <h3>{{ post.title }}</h3>
             {{ post.body_html|safe if post.body_html }}
         </fieldset>
         {% if comment %}
-            <fieldset class="coolfieldset mt-4"><legend class="w-auto">Comment you are replying to</legend>
+            <fieldset id="post_reply_comment" class="coolfieldset {{ 'collapsed' if request.cookies.get('fieldset_post_reply_comment_state', 'collapsed') == 'collapsed' }} mt-4 mb-4"><legend class="w-auto">Comment you are replying to</legend>
                 {{ comment.body_html|safe }}
             </fieldset>
         {% endif %}