diff --git a/app/src/main/java/chat/revolt/api/RevoltAPI.kt b/app/src/main/java/chat/revolt/api/RevoltAPI.kt
index 436fb2d2..d0763333 100644
--- a/app/src/main/java/chat/revolt/api/RevoltAPI.kt
+++ b/app/src/main/java/chat/revolt/api/RevoltAPI.kt
@@ -45,10 +45,6 @@ const val REVOLT_JANUARY = "https://jan.revolt.chat"
 const val REVOLT_APP = "https://app.revolt.chat"
 const val REVOLT_WEBSOCKET = "wss://ws.revolt.chat"
 
-fun asJanuaryProxyUrl(url: String): String {
-    return "$REVOLT_JANUARY/proxy?url=${url}"
-}
-
 fun buildUserAgent(accessMethod: String = "Ktor"): String {
     return "$accessMethod RevoltAndroid/${BuildConfig.VERSION_NAME} ${BuildConfig.APPLICATION_ID} (Android ${android.os.Build.VERSION.SDK_INT}; ${android.os.Build.MANUFACTURER} ${android.os.Build.DEVICE}; Analysis ${BuildConfig.ANALYSIS_ENABLED} ${BuildConfig.ANALYSIS_BASEURL}; (Kotlin ${KotlinVersion.CURRENT})"
 }
@@ -185,6 +181,7 @@ object RevoltAPI {
         unreads.clear()
 
         socketCoroutine?.cancel()
+        mainHandler.removeCallbacksAndMessages(null)
     }
 
     /**
diff --git a/app/src/main/java/chat/revolt/api/routes/microservices/january/January.kt b/app/src/main/java/chat/revolt/api/routes/microservices/january/January.kt
new file mode 100644
index 00000000..e9bdebb3
--- /dev/null
+++ b/app/src/main/java/chat/revolt/api/routes/microservices/january/January.kt
@@ -0,0 +1,7 @@
+package chat.revolt.api.routes.microservices.january
+
+import chat.revolt.api.REVOLT_JANUARY
+
+fun asJanuaryProxyUrl(url: String): String {
+    return "$REVOLT_JANUARY/proxy?url=${url}"
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/revolt/components/chat/Embed.kt b/app/src/main/java/chat/revolt/components/chat/Embed.kt
index 33ad2a8a..5c3e0a84 100644
--- a/app/src/main/java/chat/revolt/components/chat/Embed.kt
+++ b/app/src/main/java/chat/revolt/components/chat/Embed.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import chat.revolt.api.asJanuaryProxyUrl
+import chat.revolt.api.routes.microservices.january.asJanuaryProxyUrl
 import chat.revolt.api.internals.WebCompat
 import chat.revolt.api.schemas.Embed
 import chat.revolt.components.generic.RemoteImage
diff --git a/app/src/main/java/chat/revolt/components/chat/InReplyTo.kt b/app/src/main/java/chat/revolt/components/chat/InReplyTo.kt
index a8cf105d..99ed1d24 100644
--- a/app/src/main/java/chat/revolt/components/chat/InReplyTo.kt
+++ b/app/src/main/java/chat/revolt/components/chat/InReplyTo.kt
@@ -1,7 +1,13 @@
 package chat.revolt.components.chat
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -16,8 +22,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.revolt.R
 import chat.revolt.api.RevoltAPI
-import chat.revolt.api.asJanuaryProxyUrl
 import chat.revolt.api.internals.WebCompat
+import chat.revolt.api.routes.microservices.january.asJanuaryProxyUrl
 import chat.revolt.components.generic.UserAvatar
 
 @Composable
diff --git a/app/src/main/java/chat/revolt/components/chat/Message.kt b/app/src/main/java/chat/revolt/components/chat/Message.kt
index 26735561..07fd184a 100644
--- a/app/src/main/java/chat/revolt/components/chat/Message.kt
+++ b/app/src/main/java/chat/revolt/components/chat/Message.kt
@@ -33,7 +33,7 @@ import chat.revolt.activities.media.ImageViewActivity
 import chat.revolt.activities.media.VideoViewActivity
 import chat.revolt.api.REVOLT_FILES
 import chat.revolt.api.RevoltAPI
-import chat.revolt.api.asJanuaryProxyUrl
+import chat.revolt.api.routes.microservices.january.asJanuaryProxyUrl
 import chat.revolt.api.internals.ULID
 import chat.revolt.api.internals.WebCompat
 import chat.revolt.api.schemas.AutumnResource
diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt b/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt
index 7111e57d..aeab75ed 100644
--- a/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt
+++ b/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt
@@ -3,11 +3,21 @@ package chat.revolt.components.screens.chat
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -19,9 +29,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.revolt.R
 import chat.revolt.api.RevoltAPI
-import chat.revolt.api.asJanuaryProxyUrl
 import chat.revolt.api.internals.WebCompat
 import chat.revolt.api.routes.channel.SendMessageReply
+import chat.revolt.api.routes.microservices.january.asJanuaryProxyUrl
 import chat.revolt.components.generic.UserAvatar
 
 @Composable