diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f9a4c52a00e32f7e4684776b80f79db6927e1f31..5f394079ecbd19df8310f6298bc15baaaee69b9f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -43,7 +43,7 @@ android {
 
     signingConfig = signingConfigs.getByName("default")
 
-    resConfigs("auto")
+    resConfigs("de", "en")
 
     vectorDrawables.useSupportLibrary = true
 
diff --git a/buildSrc/src/main/kotlin/VersionContext.kt b/buildSrc/src/main/kotlin/VersionContext.kt
index 288212239f7d382d3fe1bb0127e85ed9b5e23032..806b41a630ddcbe8a2bf28128e0b478ca1f96e00 100644
--- a/buildSrc/src/main/kotlin/VersionContext.kt
+++ b/buildSrc/src/main/kotlin/VersionContext.kt
@@ -1,5 +1,7 @@
 data class VersionContext(val version: String)
 
-inline fun withVersion(version: String, f: VersionContext.() -> Unit) {
-  VersionContext(version).f()
+inline fun withVersion(version: Any?, f: VersionContext.() -> Unit) {
+  (version as? String)?.let {
+    VersionContext(version).f()
+  }
 }
\ No newline at end of file
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
index 274e2465f1707152a5126b9ea01bf3ae9e60eaf6..ee90f84629e7af522d59b32958bde10132dd0ce1 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
@@ -207,7 +207,7 @@ FROM
     WHERE bufferId = ?
           AND type & ~? > 0
   ) t
-ORDER BY time DESC
+ORDER BY time, messageId DESC
   """, arrayOf(bufferId, type, bufferId, bufferId, type)))
 
 fun QuasselDatabase.MessageDao.findByBufferIdWithDayChange(bufferId: Int, type: Int) =
@@ -241,5 +241,5 @@ FROM
     WHERE bufferId = ?
           AND type & ~? > 0
   ) t
-ORDER BY time DESC
+ORDER BY time, messageId DESC
   """, arrayOf(bufferId, type, bufferId, bufferId, type)))
\ No newline at end of file