diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt
index f1ae54813..d09233e89 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt
@@ -900,7 +900,15 @@ fun EditableServerConfig(
             onClick = {
                 if (url.isNotBlank() && url != "/") {
                     var addedWSS =
-                        if (!url.startsWith("wss://") && !url.startsWith("ws://")) "wss://$url" else url
+                        if (!url.startsWith("wss://") && !url.startsWith("ws://")) {
+                            if (url.endsWith(".onion") || url.endsWith(".onion/")) {
+                                "ws://$url"
+                            } else {
+                                "wss://$url"
+                            }
+                        } else {
+                            url
+                        }
                     if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1)
                     onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet()))
                     url = ""
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 41d6f5ab6..f02adc4ea 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -274,6 +274,7 @@
     <string name="report_dialog_title">Blokovat a nahlásit</string>
     <string name="block_only">Blokovat</string>
     <string name="bookmarks">Záložky</string>
+    <string name="drafts">Koncepty</string>
     <string name="private_bookmarks">Soukromé záložky</string>
     <string name="public_bookmarks">Veřejné záložky</string>
     <string name="add_to_private_bookmarks">Přidat do soukromých záložek</string>
@@ -620,6 +621,7 @@
     <string name="server_did_not_provide_a_url_after_uploading">Server po nahrání neposkytl URL</string>
     <string name="could_not_download_from_the_server">Nepodařilo se stáhnout nahraná média ze serveru</string>
     <string name="could_not_prepare_local_file_to_upload">Nelze připravit místní soubor k nahrání: %1$s</string>
+    <string name="edit_draft">Upravit koncept</string>
     <string name="login_with_qr_code">Přihlášení pomocí QR kódu</string>
     <string name="route">Trasa</string>
     <string name="route_home">Domů</string>
@@ -691,4 +693,10 @@
     <string name="accessibility_play_username">Přehrát uživatelské jméno jako audio</string>
     <string name="accessibility_scan_qr_code">Skenovat QR kód</string>
     <string name="accessibility_navigate_to_alby">Přejít na poskytovatele peněženky třetí strany Alby</string>
+    <string name="it_s_not_possible_to_reply_to_a_draft_note">Není možné odpovědět na koncept</string>
+    <string name="it_s_not_possible_to_quote_to_a_draft_note">Není možné citovat koncept</string>
+    <string name="it_s_not_possible_to_react_to_a_draft_note">Není možné reagovat na koncept</string>
+    <string name="it_s_not_possible_to_zap_to_a_draft_note">Není možné poslat zap konceptu</string>
+    <string name="draft_note">Koncept</string>
+    <string name="load_from_text">Ze zprávy</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 62f880b57..b0b5bef7e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -280,6 +280,7 @@ anz der Bedingungen ist erforderlich</string>
     <string name="report_dialog_title">Blockieren und melden</string>
     <string name="block_only">Blockieren</string>
     <string name="bookmarks">Lesezeichen</string>
+    <string name="drafts">Entwürfe</string>
     <string name="private_bookmarks">Private Lesezeichen</string>
     <string name="public_bookmarks">Öffentliche Lesezeichen</string>
     <string name="add_to_private_bookmarks">Zu den privaten Lesezeichen hinzufügen</string>
@@ -625,6 +626,7 @@ anz der Bedingungen ist erforderlich</string>
     <string name="server_did_not_provide_a_url_after_uploading">Der Server hat nach dem Hochladen keine URL angegeben</string>
     <string name="could_not_download_from_the_server">Hochgeladene Medien konnten nicht vom Server heruntergeladen werden</string>
     <string name="could_not_prepare_local_file_to_upload">Lokale Datei konnte nicht zum Hochladen vorbereitet werden: %1$s</string>
+    <string name="edit_draft">Entwurf bearbeiten</string>
     <string name="login_with_qr_code">Einloggen mit QR-Code</string>
     <string name="route">Route</string>
     <string name="route_home">Startseite</string>
@@ -696,4 +698,10 @@ anz der Bedingungen ist erforderlich</string>
     <string name="accessibility_play_username">Benutzernamen als Audio abspielen</string>
     <string name="accessibility_scan_qr_code">QR-Code scannen</string>
     <string name="accessibility_navigate_to_alby">Navigieren Sie zum Drittanbieter-Wallet-Anbieter Alby</string>
+    <string name="it_s_not_possible_to_reply_to_a_draft_note">Es ist nicht möglich, auf einen Entwurf zu antworten</string>
+    <string name="it_s_not_possible_to_quote_to_a_draft_note">Es ist nicht möglich, einen Entwurf zu zitieren</string>
+    <string name="it_s_not_possible_to_react_to_a_draft_note">Es ist nicht möglich, auf einen Entwurf zu reagieren</string>
+    <string name="it_s_not_possible_to_zap_to_a_draft_note">Es ist nicht möglich, zap Zahlung an einen Entwurf senden</string>
+    <string name="draft_note">Entwurf</string>
+    <string name="load_from_text">Aus Nachricht laden</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 03888e2d3..5801c61ed 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -274,6 +274,7 @@
     <string name="report_dialog_title">Blockera och rapportera</string>
     <string name="block_only">Blockera</string>
     <string name="bookmarks">Bokmärken</string>
+    <string name="drafts">Utkast</string>
     <string name="private_bookmarks">Privata Bokmärken</string>
     <string name="public_bookmarks">Publika Bokmärken</string>
     <string name="add_to_private_bookmarks">Lägg till i Privata Bokmärken</string>
@@ -619,6 +620,7 @@
     <string name="server_did_not_provide_a_url_after_uploading">Servern gav inte en URL efter uppladdning</string>
     <string name="could_not_download_from_the_server">Kunde inte ladda ner uppladdade medier från servern</string>
     <string name="could_not_prepare_local_file_to_upload">Kunde inte förbereda lokal fil att ladda upp: %1$s</string>
+    <string name="edit_draft">Redigera utkast</string>
     <string name="login_with_qr_code">Logga in med QR-kod</string>
     <string name="route">Rutt</string>
     <string name="route_home">Hem</string>
@@ -690,4 +692,10 @@
     <string name="accessibility_play_username">Spela upp användarnamn som ljud</string>
     <string name="accessibility_scan_qr_code">Skanna QR-kod</string>
     <string name="accessibility_navigate_to_alby">Navigera till tredjeparts plånboksleverantören Alby</string>
+    <string name="it_s_not_possible_to_reply_to_a_draft_note">Det går inte att svara på ett utkast</string>
+    <string name="it_s_not_possible_to_quote_to_a_draft_note">Det går inte att citera ett utkast</string>
+    <string name="it_s_not_possible_to_react_to_a_draft_note">Det går inte att reagera på ett utkast</string>
+    <string name="it_s_not_possible_to_zap_to_a_draft_note">Det går inte att zappa ett utkast</string>
+    <string name="draft_note">Utkast</string>
+    <string name="load_from_text">Från meddelande</string>
 </resources>
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/DraftEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/DraftEvent.kt
index d2803317c..dfc50de4f 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/DraftEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/DraftEvent.kt
@@ -78,7 +78,13 @@ class DraftEvent(
         onReady: (Event) -> Unit,
     ) {
         try {
-            plainContent(signer) { onReady(fromJson(it)) }
+            plainContent(signer) {
+                try {
+                    onReady(fromJson(it))
+                } catch (e: Exception) {
+                    // Log.e("UnwrapError", "Couldn't Decrypt the content", e)
+                }
+            }
         } catch (e: Exception) {
             // Log.e("UnwrapError", "Couldn't Decrypt the content", e)
         }