diff --git a/main/forum/index.php b/main/forum/index.php
index 45e3f34434..791052f82a 100755
--- a/main/forum/index.php
+++ b/main/forum/index.php
@@ -532,9 +532,6 @@ if (is_array($forumCategories)) {
     }
 }
 $tpl = new Template($nameTools);
-if(api_get_configuration_value('forum_fold_categories')==true){
-    $tpl->assign('forum_fold_categories', true);
-}
 $tpl->assign('introduction', $introduction);
 $tpl->assign('actions', $actions);
 $tpl->assign('data', $listForumCategory);
diff --git a/main/template/default/forum/list.tpl b/main/template/default/forum/list.tpl
index 6bc89455ee..7f6316cc29 100644
--- a/main/template/default/forum/list.tpl
+++ b/main/template/default/forum/list.tpl
@@ -1,8 +1,15 @@
 {% extends 'layout/layout_1_col.tpl'|get_template %}
 {% block content %}
 {{ form_content }}
-{% if data is not empty %}
-    {% if(forum_fold_categories == true) %}
+    {% set configuration = 'forum_fold_categories'|api_get_configuration_value %}
+    {% if(configuration == true) %}
+        {% set collapsed = '' %}
+        {% set in_collapse = 'in' %}
+    {% else %}
+        {% set collapsed = 'collapsed' %}
+        {% set in_collapse = '' %}
+    {% endif %}
+    {% if data is not empty %}
     <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
         {% for item in data %}
         <div class="panel panel-default">
@@ -11,7 +18,7 @@
                     {{ item.tools }}
                 </div>
                 <h4 class="panel-title">
-                    <a class="btn-collapse collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse_{{ item.id }}" aria-expanded="true" aria-controls="collapse_{{ item.id }}">
+                    <a class="btn-collapse {{ collapsed }}" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse_{{ item.id }}" aria-expanded="true" aria-controls="collapse_{{ item.id }}">
                         <span class="closed">{{ 'forum_blue_closed.png'|img(32) }}</span>
                         <span class="open">{{ 'forum_blue.png'|img(32) }}</span>
                     </a>
@@ -19,7 +26,7 @@
                 </h4>
 
             </div>
-            <div id="collapse_{{ item.id }}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading_{{ item.id }}">
+            <div id="collapse_{{ item.id }}" class="panel-collapse collapse {{ in_collapse }}" role="tabpanel" aria-labelledby="heading_{{ item.id }}">
                 <div class="panel-body">
                     <div class="forum-description">
                         {{ item.description }}
@@ -84,91 +91,14 @@
                             </div>
                         </div>
                     {% endfor %}
-
                 </div>
             </div>
         </div>
         {% endfor %}
     </div>
-    {% else %}
-        {% for item in data %}
-            <div class="category-forum" id="category_{{ item.id }}">
-                <div class="pull-right">
-                    {{ item.tools }}
-                </div>
-                <h3>
-                    {{ 'forum_blue.png'|img(32) }}
-                    <a href="{{ item.url }}" title="{{ item.title }}">{{ item.title }}{{ item.icon_session }}</a>
-                </h3>
-                <div class="forum-description">
-                    {{ item.description }}
-                </div>
-            </div>
-            {% for subitem in item.forums %}
-                <div class="forum_display">
-                    <div class="panel panel-default forum">
-                        <div class="panel-body">
-                            <div class="row">
-                                <div class="col-md-3">
-                                    <div class="number-post">
-                                        <a href="{{ forum.url }}" title="{{forum.title}}">
-                                            {% if subitem.forum_image is not empty %}
-                                                <img src="{{ subitem.forum_image }}" width="48px">
-                                            {% else %}
-                                                {% if subitem.forum_of_group == 0 %}
-                                                    {{ 'forum_group.png'|img(48) }}
-                                                {% else %}
-                                                    {{ 'forum.png'|img(48) }}
-                                                {% endif %}
-                                            {% endif %}
-                                        </a>
-                                        <p>{{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }} </p>
-                                    </div>
-                                </div>
-                                <div class="col-md-9">
-                                    <div class="pull-right">
-                                        <div class="toolbar">
-                                            {{ subitem.tools }}
-                                        </div>
-                                    </div>
-                                    <h3 class="title">
-                                        {{ 'forum_yellow.png'|img(32) }}
-                                        <a href="{{ subitem.url }}" title="{{ subitem.title }}" class="{{ subitem.visibility != '1' ? 'text-muted': '' }}">{{ subitem.title }}</a>
-                                        {% if subitem.forum_of_group != 0 %}
-                                            <a class="forum-goto" href="../group/group_space.php?{{ _p.web_cid_query }}&gidReq={{ subitem.forum_of_group }}">
-                                                {{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }}
-                                            </a>
-                                        {% endif %}
-                                        {{ subitem.icon_session }}
-                                    </h3>
-                                    {% if subitem.last_poster_id is not empty %}
-                                        <div class="forum-date">
-                                            <i class="fa fa-comments" aria-hidden="true"></i>
-                                            {{ subitem.last_poster_date }}
-                                            {{ "By"|get_lang }}
-                                            {{ subitem.last_poster_user }}
-                                        </div>
-                                    {% endif %}
-                                    <div class="description">
-                                        {{ subitem.description }}
-                                    </div>
-                                    {{ subitem.alert }}
-                                    {% if subitem.moderation is not empty %}
-                                        <span class="label label-warning">
-                                            {{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
-                                        </span>
-                                    {% endif %}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            {% endfor %}
-        {% endfor %}
-    {% endif %}
     {% else %}
         <div class="alert alert-warning">
             {{ 'NoForumInThisCategory'|get_lang }}
         </div>
-    {% endif %}
+{% endif %}
 {% endblock %}