diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
index ef15216a66..164f54f911 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
@@ -80,6 +80,13 @@ class StateContentFormatter @Inject constructor(
                     else -> sp.getString(R.string.state_event_room_topic_removed, senderDisambiguatedDisplayName)
                 }
             }
+            OtherState.RoomPinnedEvents -> {
+                when {
+                    //TODO manage all cases when available
+                    senderIsYou -> sp.getString(R.string.state_event_room_pinned_events_changed_by_you)
+                    else -> sp.getString(R.string.state_event_room_pinned_events_changed, senderDisambiguatedDisplayName)
+                }
+            }
             is OtherState.Custom -> when (renderingMode) {
                 RenderingMode.RoomList -> {
                     Timber.v("Filtering timeline item for room state change: $content")
@@ -161,15 +168,6 @@ class StateContentFormatter @Inject constructor(
                     "RoomJoinRules"
                 }
             }
-            OtherState.RoomPinnedEvents -> when (renderingMode) {
-                RenderingMode.RoomList -> {
-                    Timber.v("Filtering timeline item for room state change: $content")
-                    null
-                }
-                RenderingMode.Timeline -> {
-                    "RoomPinnedEvents"
-                }
-            }
             is OtherState.RoomUserPowerLevels -> when (renderingMode) {
                 RenderingMode.RoomList -> {
                     Timber.v("Filtering timeline item for room state change: $content")
diff --git a/libraries/eventformatter/impl/src/main/res/values/localazy.xml b/libraries/eventformatter/impl/src/main/res/values/localazy.xml
index 5e06d74e92..12dbc16a1d 100644
--- a/libraries/eventformatter/impl/src/main/res/values/localazy.xml
+++ b/libraries/eventformatter/impl/src/main/res/values/localazy.xml
@@ -45,6 +45,12 @@
   <string name="state_event_room_name_removed_by_you">"You removed the room name"</string>
   <string name="state_event_room_none">"%1$s made no changes"</string>
   <string name="state_event_room_none_by_you">"You made no changes"</string>
+  <string name="state_event_room_pinned_events_changed">"%1$s changed the pinned messages"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"You changed the pinned messages"</string>
+  <string name="state_event_room_pinned_events_pinned">"%1$s pinned a message"</string>
+  <string name="state_event_room_pinned_events_pinned_by_you">"You pinned a message"</string>
+  <string name="state_event_room_pinned_events_unpinned">"%1$s unpinned a message"</string>
+  <string name="state_event_room_pinned_events_unpinned_by_you">"You unpinned a message"</string>
   <string name="state_event_room_reject">"%1$s rejected the invitation"</string>
   <string name="state_event_room_reject_by_you">"You rejected the invitation"</string>
   <string name="state_event_room_remove">"%1$s removed %2$s"</string>