diff --git a/README.md b/README.md
index 851ee8374..1b6b6ac5d 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,6 @@ alt="Get it on Obtaininum"
 height="70">](https://github.com/ImranR98/Obtainium)
 [<img src="https://github.com/machiav3lli/oandbackupx/raw/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" alt="Get it on GitHub"
 height="70">](https://github.com/vitorpamplona/amethyst/releases)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="70">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
      alt="Get it on Google Play"
      height="70">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
index 47b4e7b47..589a7c4f5 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
@@ -337,7 +337,7 @@ fun AppNavigation(
                 popEnterTransition = { scaleIn },
                 popExitTransition = { slideOutVerticallyToBottom },
             ) {
-                val draftMessage = it.arguments?.getString("message")?.ifBlank { null }
+                val draftMessage = it.message()?.ifBlank { null }
                 val attachment =
                     it.arguments?.getString("attachment")?.ifBlank { null }?.let {
                         Uri.parse(it)
@@ -347,8 +347,8 @@ fun AppNavigation(
                 val fork = it.arguments?.getString("fork")
                 val version = it.arguments?.getString("version")
                 val draft = it.arguments?.getString("draft")
-                val enableMessageInterface = it.arguments?.getBoolean("enableMessageInterface") ?: false
-                val enableGeolocation = it.arguments?.getBoolean("enableGeolocation") ?: false
+                val enableMessageInterface = it.arguments?.getBoolean("enableMessageInterface") == true
+                val enableGeolocation = it.arguments?.getBoolean("enableGeolocation") == true
 
                 NewPostScreen(
                     message = draftMessage,