diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
index ad0daf0fe..b87d61592 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -151,7 +151,7 @@ open class Note(val idHex: String) {
         val replyTo = replyTo
         if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return LevelSignature(
-                signature = "/" + formattedDateTime(createdAt() ?: 0) + ";",
+                signature = "/" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) + ";",
                 createdAt = createdAt(),
                 author = author
             )
@@ -176,13 +176,13 @@ open class Note(val idHex: String) {
 
         val threadOrder = if (parent?.author == author && createdAt() != null) {
             // author of the thread first, in **ascending** order
-            "9" + formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0)))
+            "9" + formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0))) + idHex.substring(0, 8)
         } else if (author?.pubkeyHex == account.pubkeyHex) {
-            "8" + formattedDateTime(createdAt() ?: 0) // my replies
+            "8" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my replies
         } else if (author?.pubkeyHex in accountFollowingSet) {
-            "7" + formattedDateTime(createdAt() ?: 0) // my follows replies.
+            "7" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my follows replies.
         } else {
-            "0" + formattedDateTime(createdAt() ?: 0) // everyone else.
+            "0" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // everyone else.
         }
 
         val mySignature = LevelSignature(