diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 820ee4b9..55c3cd89 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1610,15 +1610,22 @@ function mfh_print_message() {
                 ?>
             </div>
             <div class="timeline-body">
-                <?php
-                if ($ticket['message'] != '') {
-                    if ($ticket['html']) {
-                        echo hesk_html_entity_decode($ticket['message']);
-                    } else {
-                        echo $ticket['message'];
-                    }
-                }
-                ?>
+                <div class="row">
+                    <div class="col-md-3 text-right">
+                        <strong><?php echo $hesklang['message_colon']; ?></strong>
+                    </div>
+                    <div class="col-md-9">
+                        <?php
+                        if ($ticket['message'] != '') {
+                            if ($ticket['html']) {
+                                echo hesk_html_entity_decode($ticket['message']);
+                            } else {
+                                echo $ticket['message'];
+                            }
+                        }
+                        ?>
+                    </div>
+                </div>
             </div>
             <?php
             $first = true;
@@ -1714,12 +1721,19 @@ function hesk_printTicketReplies()
                 <span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span>
                 <h3 class="timeline-header"><?php echo $reply['name']; ?></h3>
                 <div class="timeline-body">
-                    <?php
-                    if ($reply['html']) {
-                        echo hesk_html_entity_decode($reply['message']);
-                    } else {
-                        echo $reply['message'];
-                    } ?>
+                    <div class="row">
+                        <div class="col-md-3 text-right">
+                            <strong><?php echo $hesklang['message_colon']; ?></strong>
+                        </div>
+                        <div class="col-md-9">
+                            <?php
+                            if ($reply['html']) {
+                                echo hesk_html_entity_decode($reply['message']);
+                            } else {
+                                echo $reply['message'];
+                            } ?>
+                        </div>
+                    </div>
                 </div>
                 <?php
                 if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])):
diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
index d56cebd9..94289cb1 100644
--- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
@@ -22,6 +22,7 @@ $(document).ready(function() {
                         events.push(buildEvent(this.id, this));
                     });
                     callback(events);
+                    updateCategoryVisibility();
                 },
                 error: function(data) {
                     console.error(data);
diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js
index eddda6c1..ea5ba6c4 100644
--- a/js/calendar/mods-for-hesk-calendar-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-readonly.js
@@ -22,6 +22,7 @@ $(document).ready(function() {
                         events.push(buildEvent(this.id, this));
                     });
                     callback(events);
+                    updateCategoryVisibility();
                 },
                 error: function(data) {
                     console.error(data);