diff --git a/back/db/api-db.ts b/back/db/api-db.ts
index bc87f96..316d268 100644
--- a/back/db/api-db.ts
+++ b/back/db/api-db.ts
@@ -122,7 +122,7 @@ export async function getMessages(roomId: number) {
 
         WHERE msg.room_id = ?
         GROUP BY msg.message_id
-        ORDER BY message.idate DESC;
+        ORDER BY message.idate ASC;
     `;
     const values = [roomId];
     return await execQueryAsync(query, values);
diff --git a/front/src/components/structure/message/Composer.vue b/front/src/components/structure/message/Composer.vue
index 52dc053..a235f30 100644
--- a/front/src/components/structure/message/Composer.vue
+++ b/front/src/components/structure/message/Composer.vue
@@ -235,6 +235,7 @@ function sendMessage() {
     display: flex;
     flex-direction: row;
     padding: 0 10px 10px 10px;
+    max-height: 500px;
     overflow: auto;
 }
 
diff --git a/front/src/components/structure/message/Options.vue b/front/src/components/structure/message/Options.vue
index 48eeb22..bcc7e8f 100644
--- a/front/src/components/structure/message/Options.vue
+++ b/front/src/components/structure/message/Options.vue
@@ -4,6 +4,7 @@ import { Message } from "@/store/models/model";
 import API from "@/services/imapAPI";
 import store from "@/store/store";
 import { isSeenFc } from "@/utils/flagsUtils";
+import SvgLoader from "@/components/utils/SvgLoader.vue";
 
 const props = defineProps({
     msg: Object as PropType<Message>,
@@ -33,7 +34,7 @@ const setFlag = (flag: string) => {
 };
 </script>
 <template>
-    <div>
+    <div id="main">
         <div class="button" @click="setFlag('\\Seen')">
             {{ isSeenFc(props.msg?.flags) ? "Mark as not read" : "Mark as read" }}
         </div>
@@ -44,14 +45,30 @@ const setFlag = (flag: string) => {
         <div>transfer</div>
         <div>see source</div>
         <div>{{ props.msg?.flags }}</div>
+        <div class="icons">
+            <SvgLoader svg="flag-line" />
+            <SvgLoader svg="reply-line" />
+            <SvgLoader svg="delete-bin-4-line" />
+            <SvgLoader svg="delete-bin-6-line" />
+            <SvgLoader svg="share-forward-line" />
+            <SvgLoader svg="reply-all-line" />
+            <SvgLoader svg="mail-check-line" />
+            <SvgLoader svg="mail-unread-line" />
+        </div>
     </div>
 </template>
 
 <style scoped>
-div {
+#main {
     text-align: center;
 }
 
+.icons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+}
+
 .button {
     border: solid 1px;
     border-radius: 6px;
diff --git a/front/src/views/room/RoomView.vue b/front/src/views/room/RoomView.vue
index 9177c4c..d287ff7 100644
--- a/front/src/views/room/RoomView.vue
+++ b/front/src/views/room/RoomView.vue
@@ -77,5 +77,6 @@ provide("room", room);
 
 .messages {
     flex-grow: 1;
+    overflow: auto;
 }
 </style>