diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt
index a07d10c9..69c92f49 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt
@@ -39,4 +39,8 @@ class PolycentricPlatformComment : IPlatformComment {
     fun cloneWithUpdatedReplyCount(replyCount: Int?): PolycentricPlatformComment {
         return PolycentricPlatformComment(contextUrl, author, message, rating, date, reference, replyCount);
     }
+
+    companion object {
+        val MAX_COMMENT_SIZE = 2000
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt
index cce0a9f3..8f724191 100644
--- a/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt
+++ b/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt
@@ -57,7 +57,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                 _textCharacterCount.text = count.toString();
 
-                if (count > MAX_COMMENT_SIZE) {
+                if (count > PolycentricPlatformComment.MAX_COMMENT_SIZE) {
                     _textCharacterCount.setTextColor(Color.RED);
                     _textCharacterCountMax.setTextColor(Color.RED);
                     _buttonCreate.alpha = 0.4f;
@@ -79,7 +79,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
         _buttonCreate.setOnClickListener {
             clearFocus();
 
-            if (_editComment.text.count() > MAX_COMMENT_SIZE) {
+            if (_editComment.text.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) {
                 UIDialogs.toast(context, "Comment should be less than 5000 characters");
                 return@setOnClickListener;
             }
@@ -131,6 +131,5 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
 
     companion object {
         private val TAG = "CommentDialog";
-        private val MAX_COMMENT_SIZE = 5000;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/models/Telemetry.kt b/app/src/main/java/com/futo/platformplayer/models/Telemetry.kt
index ec4b9935..d1ec7757 100644
--- a/app/src/main/java/com/futo/platformplayer/models/Telemetry.kt
+++ b/app/src/main/java/com/futo/platformplayer/models/Telemetry.kt
@@ -9,7 +9,6 @@ data class Telemetry(
     val buildType: String,
     val debug: Boolean,
     val isUnstableBuild: Boolean,
-    val time: Long,
     val brand: String,
     val manufacturer: String,
     val model: String
diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt b/app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt
index 18e262c9..5e28ab3a 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt
@@ -302,7 +302,7 @@ class StatePolycentric {
                         thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
                         subscribers = null
                     ),
-                    msg = post.content,
+                    msg = post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE),
                     rating = RatingLikeDislikes(likes, dislikes),
                     date = if (unixMilliseconds != null) Instant.ofEpochMilli(unixMilliseconds).atOffset(ZoneOffset.UTC) else OffsetDateTime.MIN,
                     replyCount = replies.toInt(),
diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml
index e454379a..4b9dd4c9 100644
--- a/app/src/main/res/layout/dialog_comment.xml
+++ b/app/src/main/res/layout/dialog_comment.xml
@@ -49,7 +49,7 @@
                     android:id="@+id/character_count_max"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="/5000"
+                    android:text="/2000"
                     android:textSize="14dp"
                     android:textColor="@color/white"
                     android:fontFamily="@font/inter_regular" />