diff --git a/dist/index.js b/dist/index.js
index 4b0748e1..8b7b04cd 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -352,20 +352,21 @@
   var Chat = class {
     id;
     isSubscribed = new State(false);
-    currentChannel = new State("");
-    primaryChannelInput;
+    primaryChannel = new State("");
     secondaryChannels;
     encryptionKey;
     messages;
     composingMessage;
     newSecondaryChannelName;
+    primaryChannelInput;
     cannotSendMessage;
     cannotAddSecondaryChannel;
     cannotSetChannel;
+    cannotUndoChannel;
     // init
     constructor(id = UUID()) {
       this.id = id;
-      this.primaryChannelInput = restoreState(
+      this.primaryChannel = restoreState(
         storageKeys.primaryChannel(id),
         ""
       );
@@ -379,54 +380,63 @@
         ""
       );
       this.newSecondaryChannelName = new State("");
+      this.primaryChannelInput = new State(this.primaryChannel.value);
       this.cannotSendMessage = createProxyState(
         [
-          this.currentChannel,
+          this.primaryChannel,
           this.composingMessage,
           this.isSubscribed,
           isConnected
         ],
-        () => this.currentChannel.value == "" || this.composingMessage.value == "" || this.isSubscribed.value == false || isConnected.value == false
+        () => this.primaryChannel.value == "" || this.composingMessage.value == "" || this.isSubscribed.value == false || isConnected.value == false
       );
       this.cannotAddSecondaryChannel = createProxyState(
         [this.newSecondaryChannelName],
         () => this.newSecondaryChannelName.value == ""
       );
       this.cannotSetChannel = createProxyState(
-        [this.primaryChannelInput, this.currentChannel],
-        () => this.primaryChannelInput.value == "" || this.primaryChannelInput.value == this.currentChannel.value
+        [this.primaryChannelInput, this.primaryChannel],
+        () => this.primaryChannelInput.value == "" || this.primaryChannelInput.value == this.primaryChannel.value
+      );
+      this.cannotUndoChannel = createProxyState(
+        [this.primaryChannelInput, this.primaryChannel],
+        () => this.primaryChannelInput.value == this.primaryChannel.value
       );
     }
     // handlers
-    onmessage(data) {
-      if (data.messageChannel && data.messageChannel != this.currentChannel.value)
+    onmessage = async (data) => {
+      if (data.messageChannel && data.messageChannel != this.primaryChannel.value)
         return;
       if (data.subscribed != void 0) this.handleSubscription(data.subscribed);
       if (!data.messageBody) return;
       const { sender, body, channel, isoDate } = JSON.parse(data.messageBody);
-      this.handleMessage({ sender, body, channel, isoDate });
-    }
-    handleSubscription(isSubscribed) {
+      this.handleMessage({
+        sender,
+        body: await decryptString(body, this.encryptionKey.value),
+        channel,
+        isoDate
+      });
+    };
+    handleSubscription = (isSubscribed) => {
       this.isSubscribed.value = isSubscribed;
-    }
-    handleMessage(chatMessage) {
+    };
+    handleMessage = (chatMessage) => {
       this.messages.add(chatMessage);
-    }
+    };
     // messages
-    async sendMessage() {
+    sendMessage = async () => {
       if (this.cannotSendMessage.value == true) return;
       const secondaryChannelNames = [
         ...this.secondaryChannels.value.values()
       ].map((channel) => channel);
       const allChannelNames = [
-        this.currentChannel.value,
+        this.primaryChannel.value,
         ...secondaryChannelNames
       ];
-      const encrypted = await encryptString(
+      const encrypted = this.encryptionKey.value == "" ? this.composingMessage.value : await encryptString(
         this.composingMessage.value,
         this.encryptionKey.value
       ) || this.composingMessage.value;
-      if (encrypted == void 0) return;
       const joinedChannelName = allChannelNames.join("/");
       const messageObject = {
         channel: joinedChannelName,
@@ -437,351 +447,41 @@
       const messageString = JSON.stringify(messageObject);
       UDN.sendMessage(joinedChannelName, messageString);
       this.composingMessage.value = "";
-    }
-    clearMessages() {
+    };
+    clearMessages = () => {
       this.messages.clear();
-    }
-    deleteMessage(message) {
+    };
+    deleteMessage = (message) => {
       this.messages.remove(message);
-    }
-    async decryptReceivedMessage(message) {
+    };
+    decryptReceivedMessage = async (message) => {
       message.body = await decryptString(message.body, this.encryptionKey.value);
       this.messages.callSubscriptions();
-    }
+    };
     // channel
-    setChannel() {
+    setChannel = () => {
       if (this.cannotSetChannel.value == true) return;
-      this.currentChannel.value = this.primaryChannelInput.value;
-      UDN.subscribe(this.currentChannel.value);
-    }
-    addSecondaryChannel() {
+      this.primaryChannel.value = this.primaryChannelInput.value;
+      UDN.subscribe(this.primaryChannel.value);
+    };
+    undoChannelChange = () => {
+      this.primaryChannelInput.value = this.primaryChannel.value;
+    };
+    addSecondaryChannel = () => {
       if (this.cannotAddSecondaryChannel.value == true) return;
       this.secondaryChannels.add(this.newSecondaryChannelName.value);
       this.newSecondaryChannelName.value = "";
-    }
-    removeSecondaryChannel(channel) {
+    };
+    removeSecondaryChannel = (channel) => {
       this.secondaryChannels.remove(channel);
-    }
+    };
   };
-  var chatIds = restoreListState("chat-ids");
-  var chats = new ListState();
-  chatIds.value.forEach((id) => chats.add(new Chat(id)));
   function createChatWithName(name) {
     const newChat = new Chat();
-    newChat.currentChannel.value = name;
-    chatIds.add(newChat.id);
     chats.add(newChat);
-  }
-  function removeChat(chat) {
-    Object.values(storageKeys).forEach((cb) => {
-      localStorage.removeItem(cb(chat.id));
-    });
-    chats.remove(chat);
-    chatIds.remove(chat.id);
-  }
-
-  // src/translations.ts
-  var englishTranslations = {
-    // general
-    setInput: "Set",
-    back: "Back",
-    // overview
-    overview: "Overview",
-    connection: "Connection",
-    chats: "Chats",
-    serverAddress: "Server Address",
-    serverAddressPlaceholder: "wss://192.168.0.69:3000",
-    connectToServer: "Connect",
-    disconnect: "Disonnect",
-    resetAddress: "Reset address",
-    newChatPrimaryChannel: "Primary channel",
-    newChatNamePlaceholder: "my-channel",
-    addChat: "Add",
-    removeChat: "Remove chat",
-    // messages
-    noChatSelected: "No chat selected",
-    primaryChannel: "Primary channel",
-    leaveChannel: "Leave",
-    channelPlaceholder: "my-channel",
-    addSecondaryChannel: "Add secondary channel",
-    removeSecondaryChannel: "Remove secondary channel",
-    newSecondaryChannelPlaceholder: "Add secondary channel",
-    encryptionKey: "Encryption key",
-    encryptionKeyPlaceholder: "1jg028ej40d",
-    showEncryptionKey: "Show encryption key",
-    myName: "My Name",
-    yourNamePlaceholder: "Jane Doe",
-    mailbox: "Mailbox",
-    requestMailbox: "Enable",
-    deleteMailbox: "Disable",
-    mailboxExplanation: "When you're disconnected, messages will be kept on the server temporarily",
-    // messages
-    messages: "Messages",
-    composerPlaceholder: "Type a message...",
-    sendMessage: "Send",
-    clearHistory: "Clear history",
-    encryptionUnavailableTitle: "Encryption is not available",
-    encryptionUnavailableMessage: "Obtain this app via HTTPS or continue without encryption",
-    decryptMessage: "Decrypt message",
-    copyMessage: "Copy message",
-    deleteMessage: "Delete message"
-  };
-  var allTranslations = {
-    en: englishTranslations,
-    es: {
-      // general
-      setInput: "OK",
-      // settings
-      overview: "Configuraci\xF3n",
-      connection: "Conexi\xF3n",
-      communication: "Comunicaci\xF3n",
-      encryption: "Cifrado",
-      serverAddress: "Direcci\xF3n del servidor",
-      serverAddressPlaceholder: "wss://192.168.0.69:3000",
-      connectToServer: "Conectar",
-      disconnect: "Desconectar",
-      primaryChannel: "Canal principal",
-      leaveChannel: "Salir",
-      channelPlaceholder: "mi-canal",
-      addSecondaryChannel: "A\xF1adir canal segundario",
-      removeSecondaryChannel: "Eliminar canal segundario",
-      newSecondaryChannelPlaceholder: "A\xF1adir canal segundario",
-      encryptionKey: "Clave de cifrada",
-      encryptionKeyPlaceholder: "1jg028ej40d",
-      showEncryptionKey: "Mostrar clave de cifrado",
-      myName: "Mi nombre",
-      yourNamePlaceholder: "Juan P\xE9rez",
-      mailbox: "Buz\xF3n",
-      requestMailbox: "Activar",
-      deleteMailbox: "Desactivar",
-      mailboxExplanation: "Si est\xE1s sin conexi\xF3n, los mensajes se guardar\xE1n temporalmente en el servidor",
-      // messages
-      messages: "Mensajes",
-      composerPlaceholder: "Escribe un mensaje...",
-      sendMessage: "Enviar",
-      clearHistory: "Borrar historial",
-      encryptionUnavailableTitle: "Cifrado no disponible",
-      encryptionUnavailableMessage: "Obt\xE9n esta p\xE1gina a trav\xE9s de HTTPS para cifrar o contin\xFAa sin cifrado",
-      decryptMessage: "Descifrar mensaje",
-      copyMessage: "Copiar mensaje",
-      deleteMessage: "Eliminar mensaje"
-    },
-    de: {
-      // general
-      setInput: "OK",
-      // settings
-      overview: "Einstellungen",
-      connection: "Verbindung",
-      communication: "Kommunikation",
-      encryption: "Verschl\xFCsselung",
-      serverAddress: "Serveraddresse",
-      serverAddressPlaceholder: "wss://192.168.0.69:3000",
-      connectToServer: "Verbinden",
-      disconnect: "Trennen",
-      primaryChannel: "Hauptkanal",
-      leaveChannel: "Verlassen",
-      channelPlaceholder: "mein-kanal",
-      addSecondaryChannel: "Zweitkanal hinzuf\xFCgen",
-      removeSecondaryChannel: "Zweitkanal entfernen",
-      newSecondaryChannelPlaceholder: "Zweitkanal hinzuf\xFCgen",
-      encryptionKey: "Schl\xFCssel",
-      encryptionKeyPlaceholder: "1jg028ej40d",
-      showEncryptionKey: "Schl\xFCssel anzeigen",
-      myName: "Mein Name",
-      yourNamePlaceholder: "Max Mustermann",
-      mailbox: "Briefkasten",
-      requestMailbox: "Aktivieren",
-      deleteMailbox: "Deaktivieren",
-      mailboxExplanation: "Nachrichten werden tempor\xE4r auf dem Server gespeichert, wenn deine Verbindung getrennt ist",
-      // messages
-      messages: "Nachrichten",
-      composerPlaceholder: "Neue Nachricht...",
-      sendMessage: "Senden",
-      clearHistory: "Nachrichtenverlauf leeren",
-      encryptionUnavailableTitle: "Verschl\xFCsselung nicht m\xF6glich",
-      encryptionUnavailableMessage: "Um Nachrichten zu verschl\xFCsseln, lade diese Seite \xFCber HTTPS.",
-      decryptMessage: "Nachricht entschl\xFCsseln",
-      copyMessage: "Nachricht kopieren",
-      deleteMessage: "Nachricht l\xF6schen"
-    }
-  };
-  var language = navigator.language.substring(0, 2);
-  var translation = allTranslations[language] ?? allTranslations.en;
-
-  // src/Views/messageComposer.tsx
-  function MessageComposer(chat) {
-    return /* @__PURE__ */ createElement("div", { class: "flex-row width-100" }, " ", /* @__PURE__ */ createElement(
-      "input",
-      {
-        class: "width-100 flex-1",
-        style: "max-width: unset",
-        placeholder: translation.composerPlaceholder,
-        "bind:value": chat.composingMessage,
-        "on:enter": chat.sendMessage
-      }
-    ), /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "primary",
-        "on:click": chat.sendMessage,
-        "toggle:disabled": chat.cannotSendMessage
-      },
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "send")
-    ));
-  }
-
-  // src/Views/threadView.tsx
-  function ThreadView(chat) {
-    const messageConverter = (message) => {
-      function copyMessage() {
-        navigator.clipboard.writeText(message.body);
-      }
-      function decrypt2() {
-        chat.decryptReceivedMessage(message);
-      }
-      function remove() {
-        chat.deleteMessage(message);
-      }
-      return /* @__PURE__ */ createElement("div", { class: "tile width-100 flex-no padding-0" }, /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("div", { class: "flex-row justify-apart align-center secondary" }, /* @__PURE__ */ createElement("span", { class: "padding-h ellipsis" }, /* @__PURE__ */ createElement("b", { class: "info" }, message.sender), " - ", message.channel), /* @__PURE__ */ createElement("span", { class: "flex-row" }, /* @__PURE__ */ createElement(
-        "button",
-        {
-          "aria-label": translation.copyMessage,
-          "on:click": copyMessage
-        },
-        /* @__PURE__ */ createElement("span", { class: "icon" }, "content_copy")
-      ), /* @__PURE__ */ createElement(
-        "button",
-        {
-          "aria-label": translation.decryptMessage,
-          "on:click": decrypt2
-        },
-        /* @__PURE__ */ createElement("span", { class: "icon" }, "key")
-      ), /* @__PURE__ */ createElement("button", { "aria-label": translation.deleteMessage, "on:click": remove }, /* @__PURE__ */ createElement("span", { class: "icon" }, "delete")))), /* @__PURE__ */ createElement("div", { class: "flex-column padding-h padding-bottom" }, /* @__PURE__ */ createElement("b", { class: "break-word", "subscribe:innerText": message.body }), /* @__PURE__ */ createElement("span", { class: "secondary" }, new Date(message.isoDate).toLocaleString()))));
-    };
-    return /* @__PURE__ */ createElement(
-      "div",
-      {
-        class: "flex-column gap",
-        "children:append": [chat.messages, messageConverter]
-      }
-    );
-  }
-
-  // src/Tabs/messageTab.tsx
-  function MessageTab() {
-    const messageTabContent = createProxyState([selectedChat], () => {
-      if (selectedChat.value == void 0)
-        return /* @__PURE__ */ createElement("div", { class: "width-100 height-100 flex-column align-center justify-center" }, /* @__PURE__ */ createElement("span", { class: "secondary" }, translation.noChatSelected));
-      const chat = selectedChat.value;
-      function clearMessageHistory() {
-        chat.clearMessages();
-      }
-      return /* @__PURE__ */ createElement("article", { id: "message-tab" }, /* @__PURE__ */ createElement("header", { class: "padding-0" }, /* @__PURE__ */ createElement("span", { class: "flex-row align-center" }, /* @__PURE__ */ createElement("button", { "aria-label": translation.back, "on:click": closeChatView }, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_back")), /* @__PURE__ */ createElement("span", { "subscribe:innerText": chat.currentChannel })), /* @__PURE__ */ createElement("span", null, /* @__PURE__ */ createElement(
-        "button",
-        {
-          "aria-label": translation.clearHistory,
-          "on:click": clearMessageHistory
-        },
-        /* @__PURE__ */ createElement("span", { class: "icon" }, "delete_sweep")
-      ))), ThreadView(chat), /* @__PURE__ */ createElement("footer", null, MessageComposer(chat)));
-    });
-    return /* @__PURE__ */ createElement("div", { "children:set": messageTabContent });
-  }
-
-  // src/Views/chatListSection.tsx
-  var chatConverter = (chat) => {
-    function remove() {
-      removeChat(chat);
-    }
-    return /* @__PURE__ */ createElement("div", { class: "tile padding-0" }, /* @__PURE__ */ createElement("div", { class: "flex-row width-100 justify-apart align-center" }, /* @__PURE__ */ createElement("span", { class: "padding-h ellipsis", "subscribe:innerText": chat.currentChannel }), /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "danger",
-        "aria-label": translation.removeChat,
-        "on:click": remove
-      },
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "delete")
-    )));
-  };
-  function ChatListSection() {
-    return /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("h2", null, translation.chats), /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.newChatPrimaryChannel), /* @__PURE__ */ createElement(
-      "input",
-      {
-        "bind:value": newChatName,
-        placeholder: translation.newChatNamePlaceholder,
-        "on:enter": createChat
-      }
-    ))), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "primary width-50",
-        "toggle:disabled": cannotCreateChat,
-        "on:click": createChat
-      },
-      translation.addChat,
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "add")
-    )), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "flex-column gap", "children:append": [chats, chatConverter] }));
-  }
-
-  // src/Views/connectionSection.tsx
-  function ConnectionSection() {
-    return /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("h2", null, translation.connection), /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "cell_tower"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.serverAddress), /* @__PURE__ */ createElement(
-      "input",
-      {
-        "bind:value": serverAddressInput,
-        "on:enter": connect,
-        placeholder: translation.serverAddressPlaceholder
-      }
-    ))), /* @__PURE__ */ createElement("div", { class: "flex-row width-input justify-end" }, /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "danger width-100 flex-1 justify-center",
-        "aria-label": translation.disconnect,
-        "on:click": disconnect,
-        "toggle:disabled": cannotDisonnect
-      },
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "close")
-    ), /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "width-100 flex-1 justify-center",
-        "aria-label": translation.resetAddress,
-        "on:click": resetAddressInput,
-        "toggle:disabled": cannotResetAddress
-      },
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "undo")
-    ), /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "primary width-100 flex-1 justify-center",
-        "aria-label": translation.connectToServer,
-        "on:click": connect,
-        "toggle:disabled": cannotConnect
-      },
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward")
-    )), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "inbox"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("b", null, translation.mailbox), /* @__PURE__ */ createElement("span", { class: "secondary" }, translation.mailboxExplanation))), /* @__PURE__ */ createElement("div", { class: "flex-row width-input justify-end" }, /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "danger width-100 flex-1",
-        "on:click": deleteMailbox,
-        "toggle:disabled": cannotDeleteMailbox
-      },
-      translation.deleteMailbox
-    ), /* @__PURE__ */ createElement(
-      "button",
-      {
-        class: "primary width-100 flex-1",
-        "on:click": requestMailbox,
-        "toggle:disabled": cannotRequestMailbox
-      },
-      translation.requestMailbox,
-      /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward")
-    )));
-  }
-
-  // src/Tabs/settingsTab.tsx
-  function SettingsTab() {
-    return /* @__PURE__ */ createElement("article", { id: "settings-tab", "toggle:connected": isConnected }, /* @__PURE__ */ createElement("header", null, translation.overview), /* @__PURE__ */ createElement("div", { class: "flex-column large-gap" }, ConnectionSection(), ChatListSection()));
+    newChat.primaryChannel.value = name;
+    chatIds.add(newChat.id);
+    UDN.subscribe(name);
   }
 
   // node_modules/udn-frontend/index.ts
@@ -896,7 +596,7 @@
     }
   };
 
-  // src/index.tsx
+  // src/Model/model.ts
   var UDN = new UDNFrontend();
   var isConnected = new State(false);
   var serverAddressInput = restoreState("socket-address", "");
@@ -934,6 +634,9 @@
   }
   UDN.onconnect = () => {
     isConnected.value = true;
+    chats.value.forEach((chat) => {
+      UDN.subscribe(chat.primaryChannel.value);
+    });
   };
   UDN.onmessage = (data) => {
     chats.value.forEach((chat) => {
@@ -961,10 +664,6 @@
     if (cannotDeleteMailbox.value == true) return;
     UDN.deleteMailbox(mailboxId.value);
   }
-  function updateMailbox() {
-    deleteMailbox();
-    updateMailbox();
-  }
   UDN.onmailboxcreate = (id) => {
     mailboxId.value = id;
     UDN.connectMailbox(id);
@@ -976,8 +675,10 @@
     isMailboxActive.value = false;
     mailboxId.value = "";
   };
-  var isEncryptionUnavailable = window.crypto.subtle == void 0;
+  var isEncryptionAvailable = window.crypto.subtle != void 0;
   var senderName = restoreState("sender-name", "");
+  var chats = new ListState();
+  var chatIds = restoreListState("chat-ids");
   var selectedChat = new State(void 0);
   var newChatName = new State("");
   var cannotCreateChat = createProxyState(
@@ -993,9 +694,325 @@
     selectedChat.value = void 0;
     document.getElementById("settings-tab")?.scrollIntoView();
   }
+  function selectChat(chat) {
+    selectedChat.value = chat;
+  }
+  chatIds.value.forEach((id) => chats.add(new Chat(id)));
   if (serverAddressInput.value != "" && didRequestConnection.value == true) {
     connect();
   }
-  document.querySelector("main").append(SettingsTab(), MessageTab());
+
+  // src/translations.ts
+  var englishTranslations = {
+    // general
+    set: "Set",
+    back: "Back",
+    undoChanges: "Undo changes",
+    close: "Close",
+    // overview
+    overview: "Overview",
+    connection: "Connection",
+    chats: "Chats",
+    encryptionUnavailableTitle: "Encryption is not available",
+    encryptionUnavailableMessage: "Obtain this app via HTTPS or continue without encryption",
+    serverAddress: "Server Address",
+    serverAddressPlaceholder: "wss://192.168.0.69:3000",
+    connectToServer: "Connect",
+    disconnect: "Disonnect",
+    mailbox: "Mailbox",
+    requestMailbox: "Enable",
+    deleteMailbox: "Disable",
+    mailboxExplanation: "When you're disconnected, messages will be kept on the server temporarily",
+    newChatPrimaryChannel: "Primary channel",
+    newChatNamePlaceholder: "my-channel",
+    addChat: "Add",
+    removeChat: "Remove chat",
+    // messages
+    showChatOptions: "show chat options",
+    configureChatTitle: "Configure Chat",
+    primaryChannel: "Primary channel",
+    primaryChannelPlaceholder: "my-channel",
+    secondaryChannel: "Secondary channel",
+    secondaryChannelPlaceholder: "Add secondary channel",
+    addSecondaryChannel: "Add secondary channel",
+    removeSecondaryChannel: "Remove secondary channel",
+    encryptionKey: "Encryption key",
+    encryptionKeyPlaceholder: "n10d2482dg283hg",
+    noChatSelected: "No chat selected",
+    composerPlaceholder: "Type a message...",
+    sendMessage: "Send",
+    decryptMessage: "Decrypt message",
+    copyMessage: "Copy message",
+    deleteMessage: "Delete message"
+  };
+  var allTranslations = {
+    en: englishTranslations
+  };
+  var language = navigator.language.substring(0, 2);
+  var translation = allTranslations[language] ?? allTranslations.en;
+
+  // src/Views/chatOptionModal.tsx
+  function ChatOptionModal(chat, isPresented) {
+    function closeModal() {
+      isPresented.value = false;
+    }
+    const secondaryChannelConverter = (secondaryChannel) => {
+      function remove() {
+        chat.removeSecondaryChannel(secondaryChannel);
+      }
+      return /* @__PURE__ */ createElement("div", { class: "tile width-input padding-0" }, /* @__PURE__ */ createElement("div", { class: "flex-row justify-apart align-center" }, /* @__PURE__ */ createElement("b", { class: "padding-h" }, secondaryChannel), /* @__PURE__ */ createElement(
+        "button",
+        {
+          class: "danger",
+          "aria-label": translation.removeSecondaryChannel,
+          "on:click": remove
+        },
+        /* @__PURE__ */ createElement("span", { class: "icon" }, "delete")
+      )));
+    };
+    return /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isPresented }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translation.configureChatTitle), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.primaryChannel), /* @__PURE__ */ createElement(
+      "input",
+      {
+        "bind:value": chat.primaryChannelInput,
+        placeholder: translation.primaryChannelPlaceholder,
+        "on:enter": chat.setChannel
+      }
+    ))), /* @__PURE__ */ createElement("div", { class: "flex-row width-input" }, /* @__PURE__ */ createElement(
+      "button",
+      {
+        "aria-label": translation.undoChanges,
+        class: "flex justify-center",
+        "on:click": chat.undoChannelChange,
+        "toggle:disabled": chat.cannotUndoChannel
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "undo")
+    ), /* @__PURE__ */ createElement(
+      "button",
+      {
+        "aria-label": translation.set,
+        class: "flex justify-center primary",
+        "on:click": chat.setChannel,
+        "toggle:disabled": chat.cannotSetChannel
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "check")
+    ))), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "flex-row margin-bottom width-input" }, /* @__PURE__ */ createElement(
+      "input",
+      {
+        "aria-label": translation.secondaryChannel,
+        placeholder: translation.secondaryChannelPlaceholder,
+        "bind:value": chat.newSecondaryChannelName,
+        "on:enter": chat.addSecondaryChannel
+      }
+    ), /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "primary",
+        "toggle:disabled": chat.cannotAddSecondaryChannel,
+        "aria-label": translation.addSecondaryChannel,
+        "on:click": chat.addSecondaryChannel
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "add")
+    )), /* @__PURE__ */ createElement(
+      "div",
+      {
+        class: "flex-column gap",
+        "children:prepend": [
+          chat.secondaryChannels,
+          secondaryChannelConverter
+        ]
+      }
+    ), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "key"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.encryptionKey), /* @__PURE__ */ createElement(
+      "input",
+      {
+        placeholder: translation.encryptionKeyPlaceholder,
+        "bind:value": chat.encryptionKey
+      }
+    )))), /* @__PURE__ */ createElement("button", { class: "danger", "on:click": closeModal }, translation.close, /* @__PURE__ */ createElement("span", { class: "icon" }, "close"))));
+  }
+
+  // src/Views/messageComposer.tsx
+  function MessageComposer(chat) {
+    return /* @__PURE__ */ createElement("div", { class: "flex-row width-100" }, " ", /* @__PURE__ */ createElement(
+      "input",
+      {
+        class: "width-100 flex-1",
+        style: "max-width: unset",
+        placeholder: translation.composerPlaceholder,
+        "bind:value": chat.composingMessage,
+        "on:enter": chat.sendMessage
+      }
+    ), /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "primary",
+        "on:click": chat.sendMessage,
+        "toggle:disabled": chat.cannotSendMessage
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "send")
+    ));
+  }
+
+  // src/Views/threadView.tsx
+  function ThreadView(chat) {
+    const messageConverter = (message) => {
+      function copyMessage() {
+        navigator.clipboard.writeText(message.body);
+      }
+      function decrypt2() {
+        chat.decryptReceivedMessage(message);
+      }
+      function remove() {
+        chat.deleteMessage(message);
+      }
+      return /* @__PURE__ */ createElement("div", { class: "tile width-100 flex-no padding-0" }, /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("div", { class: "flex-row justify-apart align-center secondary" }, /* @__PURE__ */ createElement("span", { class: "padding-h ellipsis" }, /* @__PURE__ */ createElement("b", { class: "info" }, message.sender), " - ", message.channel), /* @__PURE__ */ createElement("span", { class: "flex-row" }, /* @__PURE__ */ createElement(
+        "button",
+        {
+          "aria-label": translation.copyMessage,
+          "on:click": copyMessage
+        },
+        /* @__PURE__ */ createElement("span", { class: "icon" }, "content_copy")
+      ), /* @__PURE__ */ createElement(
+        "button",
+        {
+          "aria-label": translation.decryptMessage,
+          "on:click": decrypt2
+        },
+        /* @__PURE__ */ createElement("span", { class: "icon" }, "key")
+      ), /* @__PURE__ */ createElement("button", { "aria-label": translation.deleteMessage, "on:click": remove }, /* @__PURE__ */ createElement("span", { class: "icon" }, "delete")))), /* @__PURE__ */ createElement("div", { class: "flex-column padding-h padding-bottom" }, /* @__PURE__ */ createElement("b", { class: "break-word" }, message.body), /* @__PURE__ */ createElement("span", { class: "secondary" }, new Date(message.isoDate).toLocaleString()))));
+    };
+    return /* @__PURE__ */ createElement(
+      "div",
+      {
+        class: "flex-column gap",
+        "children:append": [chat.messages, messageConverter]
+      }
+    );
+  }
+
+  // src/Tabs/messageTab.tsx
+  function MessageTab() {
+    const messageTabContent = createProxyState([selectedChat], () => {
+      if (selectedChat.value == void 0)
+        return /* @__PURE__ */ createElement("div", { class: "width-100 height-100 flex-column align-center justify-center" }, /* @__PURE__ */ createElement("span", { class: "secondary" }, translation.noChatSelected));
+      const chat = selectedChat.value;
+      const isShowingOptions = new State(false);
+      function showOptions() {
+        isShowingOptions.value = true;
+      }
+      function hideOptions() {
+        isShowingOptions.value = false;
+      }
+      return /* @__PURE__ */ createElement("article", { id: "message-tab" }, /* @__PURE__ */ createElement("header", { class: "padding-0" }, /* @__PURE__ */ createElement("span", { class: "flex-row align-center" }, /* @__PURE__ */ createElement("button", { "aria-label": translation.back, "on:click": closeChatView }, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_back")), /* @__PURE__ */ createElement("span", { "subscribe:innerText": chat.primaryChannel })), /* @__PURE__ */ createElement("span", null, /* @__PURE__ */ createElement(
+        "button",
+        {
+          "aria-label": translation.showChatOptions,
+          "on:click": showOptions
+        },
+        /* @__PURE__ */ createElement("span", { class: "icon" }, "tune")
+      ))), ThreadView(chat), /* @__PURE__ */ createElement("footer", null, MessageComposer(chat)), ChatOptionModal(chat, isShowingOptions));
+    });
+    return /* @__PURE__ */ createElement("div", { "children:set": messageTabContent });
+  }
+
+  // src/Views/chatListSection.tsx
+  var chatConverter = (chat) => {
+    function select() {
+      selectChat(chat);
+    }
+    const isSelected = createProxyState(
+      [selectedChat],
+      () => selectedChat.value == chat
+    );
+    return /* @__PURE__ */ createElement("button", { class: "tile", "on:click": select, "toggle:selected": isSelected }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("b", { class: "ellipsis", "subscribe:innerText": chat.primaryChannel })), /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward"));
+  };
+  function ChatListSection() {
+    return /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("h2", null, translation.chats), /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.newChatPrimaryChannel), /* @__PURE__ */ createElement(
+      "input",
+      {
+        "bind:value": newChatName,
+        placeholder: translation.newChatNamePlaceholder,
+        "on:enter": createChat
+      }
+    ))), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "primary width-50",
+        "toggle:disabled": cannotCreateChat,
+        "on:click": createChat
+      },
+      translation.addChat,
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "add")
+    )), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement(
+      "div",
+      {
+        class: "flex-column gap",
+        "children:append": [chats, chatConverter]
+      }
+    ));
+  }
+
+  // src/Views/connectionSection.tsx
+  function ConnectionSection() {
+    return /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("h2", null, translation.connection), /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "cell_tower"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.serverAddress), /* @__PURE__ */ createElement(
+      "input",
+      {
+        "bind:value": serverAddressInput,
+        "on:enter": connect,
+        placeholder: translation.serverAddressPlaceholder
+      }
+    ))), /* @__PURE__ */ createElement("div", { class: "flex-row width-input justify-end" }, /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "danger width-100 flex-1 justify-center",
+        "aria-label": translation.disconnect,
+        "on:click": disconnect,
+        "toggle:disabled": cannotDisonnect
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "close")
+    ), /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "width-100 flex-1 justify-center",
+        "aria-label": translation.undoChanges,
+        "on:click": resetAddressInput,
+        "toggle:disabled": cannotResetAddress
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "undo")
+    ), /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "primary width-100 flex-1 justify-center",
+        "aria-label": translation.connectToServer,
+        "on:click": connect,
+        "toggle:disabled": cannotConnect
+      },
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward")
+    )), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "inbox"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("b", null, translation.mailbox), /* @__PURE__ */ createElement("span", { class: "secondary" }, translation.mailboxExplanation))), /* @__PURE__ */ createElement("div", { class: "flex-row width-input justify-end" }, /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "danger width-100 flex-1",
+        "on:click": deleteMailbox,
+        "toggle:disabled": cannotDeleteMailbox
+      },
+      translation.deleteMailbox
+    ), /* @__PURE__ */ createElement(
+      "button",
+      {
+        class: "primary width-100 flex-1",
+        "on:click": requestMailbox,
+        "toggle:disabled": cannotRequestMailbox
+      },
+      translation.requestMailbox,
+      /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward")
+    )));
+  }
+
+  // src/Tabs/overviewTab.tsx
+  function OverviewTab() {
+    return /* @__PURE__ */ createElement("article", { id: "settings-tab", "toggle:connected": isConnected }, /* @__PURE__ */ createElement("header", null, translation.overview), /* @__PURE__ */ createElement("div", { class: "flex-column large-gap" }, /* @__PURE__ */ createElement("div", { class: "tile error flex-no", "toggle:hidden": isEncryptionAvailable }, /* @__PURE__ */ createElement("span", { class: "icon" }, "warning"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("b", null, translation.encryptionUnavailableTitle), /* @__PURE__ */ createElement("span", { class: "secondary" }, translation.encryptionUnavailableMessage))), ConnectionSection(), ChatListSection()));
+  }
+
+  // src/index.tsx
+  document.querySelector("main").append(OverviewTab(), MessageTab());
   document.querySelector("main").classList.add("split");
 })();
diff --git a/dist/styles.css b/dist/styles.css
index c48e0d43..4fff6a30 100644
--- a/dist/styles.css
+++ b/dist/styles.css
@@ -422,6 +422,7 @@ main,
 }
 
 .modal > div,
+.modal main,
 .tile > div {
   flex-direction: column;
 }
diff --git a/src/Model/chatModel.ts b/src/Model/chatModel.ts
index eccde818..cdea662b 100644
--- a/src/Model/chatModel.ts
+++ b/src/Model/chatModel.ts
@@ -1,6 +1,6 @@
 import * as React from "bloatless-react";
 
-import { UDN, isConnected, senderName } from "../Model/model";
+import { UDN, chatIds, chats, isConnected, senderName } from "../Model/model";
 import { decryptString, encryptString } from "../cryptUtility";
 
 import { Message } from "udn-frontend";
@@ -20,9 +20,7 @@ export class Chat {
   id: string;
 
   isSubscribed = new React.State(false);
-  currentChannel = new React.State("");
-
-  primaryChannelInput: React.State<string>;
+  primaryChannel = new React.State("");
   secondaryChannels: React.ListState<string>;
 
   encryptionKey: React.State<string>;
@@ -30,17 +28,19 @@ export class Chat {
 
   composingMessage: React.State<string>;
   newSecondaryChannelName: React.State<string>;
+  primaryChannelInput: React.State<string>;
 
   cannotSendMessage: React.State<boolean>;
   cannotAddSecondaryChannel: React.State<boolean>;
   cannotSetChannel: React.State<boolean>;
+  cannotUndoChannel: React.State<boolean>;
 
   // init
   constructor(id: string = React.UUID()) {
     this.id = id;
 
     // channels
-    this.primaryChannelInput = React.restoreState(
+    this.primaryChannel = React.restoreState(
       storageKeys.primaryChannel(id),
       ""
     );
@@ -52,22 +52,24 @@ export class Chat {
     this.encryptionKey = React.restoreState(storageKeys.encyptionKey(id), "");
     this.messages = React.restoreListState(storageKeys.messages(id));
 
+    // inputs
     this.composingMessage = React.restoreState(
       storageKeys.composingMessage(id),
       ""
     );
     this.newSecondaryChannelName = new React.State("");
+    this.primaryChannelInput = new React.State(this.primaryChannel.value);
 
     // guards
     this.cannotSendMessage = React.createProxyState(
       [
-        this.currentChannel,
+        this.primaryChannel,
         this.composingMessage,
         this.isSubscribed,
         isConnected,
       ],
       () =>
-        this.currentChannel.value == "" ||
+        this.primaryChannel.value == "" ||
         this.composingMessage.value == "" ||
         this.isSubscribed.value == false ||
         isConnected.value == false
@@ -77,35 +79,45 @@ export class Chat {
       () => this.newSecondaryChannelName.value == ""
     );
     this.cannotSetChannel = React.createProxyState(
-      [this.primaryChannelInput, this.currentChannel],
+      [this.primaryChannelInput, this.primaryChannel],
       () =>
         this.primaryChannelInput.value == "" ||
-        this.primaryChannelInput.value == this.currentChannel.value
+        this.primaryChannelInput.value == this.primaryChannel.value
+    );
+    this.cannotUndoChannel = React.createProxyState(
+      [this.primaryChannelInput, this.primaryChannel],
+      () =>
+        this.primaryChannelInput.value == this.primaryChannel.value
     );
   }
 
   // handlers
-  onmessage(data: Message): void {
-    if (data.messageChannel && data.messageChannel != this.currentChannel.value)
+  onmessage = async (data: Message): Promise<void> => {
+    if (data.messageChannel && data.messageChannel != this.primaryChannel.value)
       return;
 
     if (data.subscribed != undefined) this.handleSubscription(data.subscribed);
 
     if (!data.messageBody) return;
     const { sender, body, channel, isoDate } = JSON.parse(data.messageBody);
-    this.handleMessage({ sender, body, channel, isoDate });
-  }
+    this.handleMessage({
+      sender,
+      body: await decryptString(body, this.encryptionKey.value),
+      channel,
+      isoDate,
+    });
+  };
 
-  handleSubscription(isSubscribed: boolean): void {
+  handleSubscription = (isSubscribed: boolean): void => {
     this.isSubscribed.value = isSubscribed;
-  }
+  };
 
-  handleMessage(chatMessage: ChatMessage): void {
+  handleMessage = (chatMessage: ChatMessage): void => {
     this.messages.add(chatMessage);
-  }
+  };
 
   // messages
-  async sendMessage(): Promise<void> {
+  sendMessage = async (): Promise<void> => {
     if (this.cannotSendMessage.value == true) return;
 
     // get channels
@@ -113,17 +125,18 @@ export class Chat {
       ...this.secondaryChannels.value.values(),
     ].map((channel) => channel);
     const allChannelNames: string[] = [
-      this.currentChannel.value,
+      this.primaryChannel.value,
       ...secondaryChannelNames,
     ];
 
     // encrypt
     const encrypted =
-      (await encryptString(
-        this.composingMessage.value,
-        this.encryptionKey.value
-      )) || this.composingMessage.value;
-    if (encrypted == undefined) return;
+      this.encryptionKey.value == ""
+        ? this.composingMessage.value
+        : (await encryptString(
+            this.composingMessage.value,
+            this.encryptionKey.value
+          )) || this.composingMessage.value;
 
     // create object
     const joinedChannelName = allChannelNames.join("/");
@@ -140,52 +153,53 @@ export class Chat {
 
     // clear
     this.composingMessage.value = "";
-  }
+  };
 
-  clearMessages(): void {
+  clearMessages = (): void => {
     this.messages.clear();
-  }
+  };
 
-  deleteMessage(message: ChatMessage): void {
+  deleteMessage = (message: ChatMessage): void => {
     this.messages.remove(message);
-  }
+  };
 
-  async decryptReceivedMessage(message: ChatMessage): Promise<void> {
+  decryptReceivedMessage = async (message: ChatMessage): Promise<void> => {
     message.body = await decryptString(message.body, this.encryptionKey.value);
     this.messages.callSubscriptions();
-  }
+  };
 
   // channel
-  setChannel(): void {
+  setChannel = (): void => {
     if (this.cannotSetChannel.value == true) return;
-    this.currentChannel.value = this.primaryChannelInput.value;
-    UDN.subscribe(this.currentChannel.value);
-  }
+    this.primaryChannel.value = this.primaryChannelInput.value;
+    UDN.subscribe(this.primaryChannel.value);
+  };
 
-  addSecondaryChannel(): void {
+  undoChannelChange = (): void => {
+    this.primaryChannelInput.value = this.primaryChannel.value;
+  };
+
+  addSecondaryChannel = (): void => {
     if (this.cannotAddSecondaryChannel.value == true) return;
 
     this.secondaryChannels.add(this.newSecondaryChannelName.value);
     this.newSecondaryChannelName.value = "";
-  }
+  };
 
-  removeSecondaryChannel(channel: string): void {
+  removeSecondaryChannel = (channel: string): void => {
     this.secondaryChannels.remove(channel);
-  }
+  };
 }
 
-// INIT
-const chatIds = React.restoreListState<string>("chat-ids");
-export const chats = new React.ListState<Chat>();
-
-chatIds.value.forEach((id) => chats.add(new Chat(id)));
-
 // METHODS
 export function createChatWithName(name: string): void {
   const newChat = new Chat();
-  newChat.currentChannel.value = name;
-  chatIds.add(newChat.id);
   chats.add(newChat);
+
+  newChat.primaryChannel.value = name;
+  chatIds.add(newChat.id);
+
+  UDN.subscribe(name);
 }
 
 export function removeChat(chat: Chat): void {
diff --git a/src/Model/model.ts b/src/Model/model.ts
index 48c99d79..21048169 100644
--- a/src/Model/model.ts
+++ b/src/Model/model.ts
@@ -1,6 +1,6 @@
 import * as React from "bloatless-react";
 
-import { Chat, chats, createChatWithName } from "./chatModel";
+import { Chat, createChatWithName } from "./chatModel";
 
 import UDNFrontend from "udn-frontend";
 
@@ -59,6 +59,10 @@ export function resetAddressInput(): void {
 // listeners
 UDN.onconnect = () => {
   isConnected.value = true;
+
+  chats.value.forEach((chat) => {
+    UDN.subscribe(chat.primaryChannel.value);
+  });
 };
 
 UDN.onmessage = (data) => {
@@ -114,9 +118,13 @@ UDN.onmailboxdelete = () => {
 };
 
 // MISC
-export const isEncryptionUnavailable = window.crypto.subtle == undefined;
+export const isEncryptionAvailable = window.crypto.subtle != undefined;
 export const senderName = React.restoreState("sender-name", "");
 
+// CHAT
+export const chats = new React.ListState<Chat>();
+export const chatIds = React.restoreListState<string>("chat-ids");
+
 export const selectedChat = new React.State<Chat | undefined>(undefined);
 export const newChatName = new React.State("");
 
@@ -127,7 +135,7 @@ export const cannotCreateChat = React.createProxyState(
 
 export function createChat() {
   if (cannotCreateChat.value == true) return;
-  
+
   createChatWithName(newChatName.value);
   newChatName.value = "";
 }
@@ -137,6 +145,12 @@ export function closeChatView() {
   document.getElementById("settings-tab")?.scrollIntoView();
 }
 
+export function selectChat(chat: Chat) {
+  selectedChat.value = chat;
+}
+
+chatIds.value.forEach((id) => chats.add(new Chat(id)));
+
 // INIT
 if (serverAddressInput.value != "" && didRequestConnection.value == true) {
   connect();
diff --git a/src/Tabs/messageTab.tsx b/src/Tabs/messageTab.tsx
index 66aef052..af468d84 100644
--- a/src/Tabs/messageTab.tsx
+++ b/src/Tabs/messageTab.tsx
@@ -2,6 +2,7 @@ import * as React from "bloatless-react";
 
 import { closeChatView, selectedChat } from "../Model/model";
 
+import { ChatOptionModal } from "../Views/chatOptionModal";
 import { MessageComposer } from "../Views/messageComposer";
 import { ThreadView } from "../Views/threadView";
 import { translation } from "../translations";
@@ -16,9 +17,13 @@ export function MessageTab() {
       );
 
     const chat = selectedChat.value;
+    const isShowingOptions = new React.State(false);
 
-    function clearMessageHistory() {
-      chat.clearMessages();
+    function showOptions() {
+      isShowingOptions.value = true;
+    }
+    function hideOptions() {
+      isShowingOptions.value = false;
     }
 
     return (
@@ -29,19 +34,21 @@ export function MessageTab() {
               <span class="icon">arrow_back</span>
             </button>
 
-            <span subscribe:innerText={chat.currentChannel}></span>
+            <span subscribe:innerText={chat.primaryChannel}></span>
           </span>
           <span>
             <button
-              aria-label={translation.clearHistory}
-              on:click={clearMessageHistory}
+              aria-label={translation.showChatOptions}
+              on:click={showOptions}
             >
-              <span class="icon">delete_sweep</span>
+              <span class="icon">tune</span>
             </button>
           </span>
         </header>
         {ThreadView(chat)}
         <footer>{MessageComposer(chat)}</footer>
+
+        {ChatOptionModal(chat, isShowingOptions)}
       </article>
     );
   });
diff --git a/src/Tabs/settingsTab.tsx b/src/Tabs/overviewTab.tsx
similarity index 50%
rename from src/Tabs/settingsTab.tsx
rename to src/Tabs/overviewTab.tsx
index 96d82831..ffd0938c 100644
--- a/src/Tabs/settingsTab.tsx
+++ b/src/Tabs/overviewTab.tsx
@@ -1,15 +1,28 @@
 import * as React from "bloatless-react";
 
+import { isConnected, isEncryptionAvailable } from "../Model/model";
+
 import { ChatListSection } from "../Views/chatListSection";
 import { ConnectionSection } from "../Views/connectionSection";
-import { isConnected } from "../Model/model";
 import { translation } from "../translations";
 
-export function SettingsTab() {
+export function OverviewTab() {
   return (
     <article id="settings-tab" toggle:connected={isConnected}>
       <header>{translation.overview}</header>
+
       <div class="flex-column large-gap">
+        
+        <div class="tile error flex-no" toggle:hidden={isEncryptionAvailable}>
+          <span class="icon">warning</span>
+          <div>
+            <b>{translation.encryptionUnavailableTitle}</b>
+            <span class="secondary">
+              {translation.encryptionUnavailableMessage}
+            </span>
+          </div>
+        </div>
+
         {ConnectionSection()}
         {ChatListSection()}
       </div>
diff --git a/src/Views/chatListSection.tsx b/src/Views/chatListSection.tsx
index ca804498..77c95788 100644
--- a/src/Views/chatListSection.tsx
+++ b/src/Views/chatListSection.tsx
@@ -1,29 +1,34 @@
 import * as React from "bloatless-react";
 
-import { Chat, chats, removeChat } from "../Model/chatModel";
-import { cannotCreateChat, createChat, newChatName } from "../Model/model";
+import { Chat, removeChat } from "../Model/chatModel";
+import {
+  cannotCreateChat,
+  chats,
+  createChat,
+  newChatName,
+  selectChat,
+  selectedChat,
+} from "../Model/model";
 
 import { translation } from "../translations";
 
 const chatConverter: React.ListItemConverter<Chat> = (chat) => {
-  function remove() {
-    removeChat(chat);
+  function select() {
+    selectChat(chat);
   }
 
+  const isSelected = React.createProxyState(
+    [selectedChat],
+    () => selectedChat.value == chat
+  );
+
   return (
-    <div class="tile padding-0">
-      <div class="flex-row width-100 justify-apart align-center">
-        <span class="padding-h ellipsis" subscribe:innerText={chat.currentChannel}></span>
-        
-        <button
-          class="danger"
-          aria-label={translation.removeChat}
-          on:click={remove}
-        >
-          <span class="icon">delete</span>
-        </button>
+    <button class="tile" on:click={select} toggle:selected={isSelected}>
+      <div>
+        <b class="ellipsis" subscribe:innerText={chat.primaryChannel}></b>
       </div>
-    </div>
+      <span class="icon">arrow_forward</span>
+    </button>
   );
 };
 
@@ -56,7 +61,10 @@ export function ChatListSection() {
 
       <hr></hr>
 
-      <div class="flex-column gap" children:append={[chats, chatConverter]}></div>
+      <div
+        class="flex-column gap"
+        children:append={[chats, chatConverter]}
+      ></div>
     </div>
   );
 }
diff --git a/src/Views/chatOptionModal.tsx b/src/Views/chatOptionModal.tsx
new file mode 100644
index 00000000..3ea958c4
--- /dev/null
+++ b/src/Views/chatOptionModal.tsx
@@ -0,0 +1,119 @@
+import * as React from "bloatless-react";
+
+import { Chat } from "../Model/chatModel";
+import { translation } from "../translations";
+
+export function ChatOptionModal(chat: Chat, isPresented: React.State<boolean>) {
+  function closeModal() {
+    isPresented.value = false;
+  }
+
+  const secondaryChannelConverter: React.ListItemConverter<string> = (
+    secondaryChannel
+  ) => {
+    function remove() {
+      chat.removeSecondaryChannel(secondaryChannel);
+    }
+
+    return (
+      <div class="tile width-input padding-0">
+        <div class="flex-row justify-apart align-center">
+          <b class="padding-h">{secondaryChannel}</b>
+          <button
+            class="danger"
+            aria-label={translation.removeSecondaryChannel}
+            on:click={remove}
+          >
+            <span class="icon">delete</span>
+          </button>
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <div class="modal" toggle:open={isPresented}>
+      <div>
+        <main>
+          <h2>{translation.configureChatTitle}</h2>
+
+          <div>
+            <label class="tile">
+              <span class="icon">forum</span>
+              <div>
+                <span>{translation.primaryChannel}</span>
+                <input
+                  bind:value={chat.primaryChannelInput}
+                  placeholder={translation.primaryChannelPlaceholder}
+                  on:enter={chat.setChannel}
+                ></input>
+              </div>
+            </label>
+            <div class="flex-row width-input">
+              <button
+                aria-label={translation.undoChanges}
+                class="flex justify-center"
+                on:click={chat.undoChannelChange}
+                toggle:disabled={chat.cannotUndoChannel}
+              >
+                <span class="icon">undo</span>
+              </button>
+              <button
+                aria-label={translation.set}
+                class="flex justify-center primary"
+                on:click={chat.setChannel}
+                toggle:disabled={chat.cannotSetChannel}
+              >
+                <span class="icon">check</span>
+              </button>
+            </div>
+          </div>
+
+          <hr></hr>
+
+          <div class="flex-row margin-bottom width-input">
+            <input
+              aria-label={translation.secondaryChannel}
+              placeholder={translation.secondaryChannelPlaceholder}
+              bind:value={chat.newSecondaryChannelName}
+              on:enter={chat.addSecondaryChannel}
+            ></input>
+            <button
+              class="primary"
+              toggle:disabled={chat.cannotAddSecondaryChannel}
+              aria-label={translation.addSecondaryChannel}
+              on:click={chat.addSecondaryChannel}
+            >
+              <span class="icon">add</span>
+            </button>
+          </div>
+
+          <div
+            class="flex-column gap"
+            children:prepend={[
+              chat.secondaryChannels,
+              secondaryChannelConverter,
+            ]}
+          ></div>
+
+          <hr></hr>
+
+          <label class="tile">
+            <span class="icon">key</span>
+            <div>
+              <span>{translation.encryptionKey}</span>
+              <input
+                placeholder={translation.encryptionKeyPlaceholder}
+                bind:value={chat.encryptionKey}
+              ></input>
+            </div>
+          </label>
+        </main>
+        <button class="danger" on:click={closeModal}>
+          {translation.close}
+          <span class="icon">close</span>
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/Views/connectionSection.tsx b/src/Views/connectionSection.tsx
index e39da79e..f45b5d0f 100644
--- a/src/Views/connectionSection.tsx
+++ b/src/Views/connectionSection.tsx
@@ -43,7 +43,7 @@ export function ConnectionSection() {
         </button>
         <button
           class="width-100 flex-1 justify-center"
-          aria-label={translation.resetAddress}
+          aria-label={translation.undoChanges}
           on:click={resetAddressInput}
           toggle:disabled={cannotResetAddress}
         >
diff --git a/src/Views/threadView.tsx b/src/Views/threadView.tsx
index fc25a9b9..c893fc78 100644
--- a/src/Views/threadView.tsx
+++ b/src/Views/threadView.tsx
@@ -44,7 +44,7 @@ export function ThreadView(chat: Chat) {
             </span>
           </div>
           <div class="flex-column padding-h padding-bottom">
-            <b class="break-word" subscribe:innerText={message.body}></b>
+            <b class="break-word">{message.body}</b>
             <span class="secondary">
               {new Date(message.isoDate).toLocaleString()}
             </span>
diff --git a/src/index.tsx b/src/index.tsx
index ac34d779..aa7178fb 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,5 @@
 import { MessageTab } from "./Tabs/messageTab";
-import { SettingsTab } from "./Tabs/settingsTab";
+import { OverviewTab } from "./Tabs/overviewTab";
 
-document.querySelector("main")!.append(SettingsTab(), MessageTab());
+document.querySelector("main")!.append(OverviewTab(), MessageTab());
 document.querySelector("main")!.classList.add("split");
diff --git a/src/translations.ts b/src/translations.ts
index 22355947..4999895b 100644
--- a/src/translations.ts
+++ b/src/translations.ts
@@ -1,7 +1,9 @@
 const englishTranslations = {
   // general
-  setInput: "Set",
+  set: "Set",
   back: "Back",
+  undoChanges: "Undo changes",
+  close: "Close",
 
   // overview
   overview: "Overview",
@@ -9,46 +11,46 @@ const englishTranslations = {
   connection: "Connection",
   chats: "Chats",
 
+  encryptionUnavailableTitle: "Encryption is not available",
+  encryptionUnavailableMessage:
+    "Obtain this app via HTTPS or continue without encryption",
+
   serverAddress: "Server Address",
   serverAddressPlaceholder: "wss://192.168.0.69:3000",
 
   connectToServer: "Connect",
   disconnect: "Disonnect",
-  resetAddress: "Reset address",
 
-  newChatPrimaryChannel: "Primary channel",
-  newChatNamePlaceholder: "my-channel",
-  addChat: "Add",
-  removeChat: "Remove chat",
-  
-  // messages
-  noChatSelected: "No chat selected",
-
-  primaryChannel: "Primary channel",
-  leaveChannel: "Leave",
-  channelPlaceholder: "my-channel",
-  addSecondaryChannel: "Add secondary channel",
-  removeSecondaryChannel: "Remove secondary channel",
-  newSecondaryChannelPlaceholder: "Add secondary channel",
-  encryptionKey: "Encryption key",
-  encryptionKeyPlaceholder: "1jg028ej40d",
-  showEncryptionKey: "Show encryption key",
-  myName: "My Name",
-  yourNamePlaceholder: "Jane Doe",
   mailbox: "Mailbox",
   requestMailbox: "Enable",
   deleteMailbox: "Disable",
   mailboxExplanation:
     "When you're disconnected, messages will be kept on the server temporarily",
 
+  newChatPrimaryChannel: "Primary channel",
+  newChatNamePlaceholder: "my-channel",
+  addChat: "Add",
+  removeChat: "Remove chat",
+
   // messages
-  messages: "Messages",
+  showChatOptions: "show chat options",
+  configureChatTitle: "Configure Chat",
+  
+  primaryChannel: "Primary channel",
+  primaryChannelPlaceholder: "my-channel",
+
+  secondaryChannel: "Secondary channel",
+  secondaryChannelPlaceholder: "Add secondary channel",
+  addSecondaryChannel: "Add secondary channel",
+  removeSecondaryChannel: "Remove secondary channel",
+
+  encryptionKey: "Encryption key",
+  encryptionKeyPlaceholder: "n10d2482dg283hg",
+
+  noChatSelected: "No chat selected",
+
   composerPlaceholder: "Type a message...",
   sendMessage: "Send",
-  clearHistory: "Clear history",
-  encryptionUnavailableTitle: "Encryption is not available",
-  encryptionUnavailableMessage:
-    "Obtain this app via HTTPS or continue without encryption",
 
   decryptMessage: "Decrypt message",
   copyMessage: "Copy message",
@@ -57,92 +59,6 @@ const englishTranslations = {
 
 const allTranslations: { [key: string]: typeof englishTranslations } = {
   en: englishTranslations,
-  es: {
-    // general
-    setInput: "OK",
-
-    // settings
-    overview: "Configuración",
-    connection: "Conexión",
-    communication: "Comunicación",
-    encryption: "Cifrado",
-    serverAddress: "Dirección del servidor",
-    serverAddressPlaceholder: "wss://192.168.0.69:3000",
-    connectToServer: "Conectar",
-    disconnect: "Desconectar",
-    primaryChannel: "Canal principal",
-    leaveChannel: "Salir",
-    channelPlaceholder: "mi-canal",
-    addSecondaryChannel: "Añadir canal segundario",
-    removeSecondaryChannel: "Eliminar canal segundario",
-    newSecondaryChannelPlaceholder: "Añadir canal segundario",
-    encryptionKey: "Clave de cifrada",
-    encryptionKeyPlaceholder: "1jg028ej40d",
-    showEncryptionKey: "Mostrar clave de cifrado",
-    myName: "Mi nombre",
-    yourNamePlaceholder: "Juan Pérez",
-    mailbox: "Buzón",
-    requestMailbox: "Activar",
-    deleteMailbox: "Desactivar",
-    mailboxExplanation:
-      "Si estás sin conexión, los mensajes se guardarán temporalmente en el servidor",
-
-    // messages
-    messages: "Mensajes",
-    composerPlaceholder: "Escribe un mensaje...",
-    sendMessage: "Enviar",
-    clearHistory: "Borrar historial",
-    encryptionUnavailableTitle: "Cifrado no disponible",
-    encryptionUnavailableMessage:
-      "Obtén esta página a través de HTTPS para cifrar o continúa sin cifrado",
-
-    decryptMessage: "Descifrar mensaje",
-    copyMessage: "Copiar mensaje",
-    deleteMessage: "Eliminar mensaje",
-  },
-  de: {
-    // general
-    setInput: "OK",
-
-    // settings
-    overview: "Einstellungen",
-    connection: "Verbindung",
-    communication: "Kommunikation",
-    encryption: "Verschlüsselung",
-    serverAddress: "Serveraddresse",
-    serverAddressPlaceholder: "wss://192.168.0.69:3000",
-    connectToServer: "Verbinden",
-    disconnect: "Trennen",
-    primaryChannel: "Hauptkanal",
-    leaveChannel: "Verlassen",
-    channelPlaceholder: "mein-kanal",
-    addSecondaryChannel: "Zweitkanal hinzufügen",
-    removeSecondaryChannel: "Zweitkanal entfernen",
-    newSecondaryChannelPlaceholder: "Zweitkanal hinzufügen",
-    encryptionKey: "Schlüssel",
-    encryptionKeyPlaceholder: "1jg028ej40d",
-    showEncryptionKey: "Schlüssel anzeigen",
-    myName: "Mein Name",
-    yourNamePlaceholder: "Max Mustermann",
-    mailbox: "Briefkasten",
-    requestMailbox: "Aktivieren",
-    deleteMailbox: "Deaktivieren",
-    mailboxExplanation:
-      "Nachrichten werden temporär auf dem Server gespeichert, wenn deine Verbindung getrennt ist",
-
-    // messages
-    messages: "Nachrichten",
-    composerPlaceholder: "Neue Nachricht...",
-    sendMessage: "Senden",
-    clearHistory: "Nachrichtenverlauf leeren",
-    encryptionUnavailableTitle: "Verschlüsselung nicht möglich",
-    encryptionUnavailableMessage:
-      "Um Nachrichten zu verschlüsseln, lade diese Seite über HTTPS.",
-
-    decryptMessage: "Nachricht entschlüsseln",
-    copyMessage: "Nachricht kopieren",
-    deleteMessage: "Nachricht löschen",
-  },
 };
 
 const language = navigator.language.substring(0, 2);