diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
index b2d4b377..5f268e61 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
@@ -51,6 +51,9 @@ class MessageActionsBottomSheet : BaseMvRxBottomSheetDialog() {
     @BindView(R.id.bottom_sheet_message_preview_sender)
     lateinit var senderNameTextView: TextView
 
+    @BindView(R.id.bottom_sheet_message_preview_timestamp)
+    lateinit var messageTimestampText: TextView
+
     @BindView(R.id.bottom_sheet_message_preview_body)
     lateinit var messageBodyTextView: TextView
 
@@ -113,6 +116,7 @@ class MessageActionsBottomSheet : BaseMvRxBottomSheetDialog() {
     override fun invalidate() = withState(viewModel) {
         senderNameTextView.text = it.senderName
         messageBodyTextView.text = it.messageBody
+        messageTimestampText.text = it.ts
 
         GlideApp.with(this).clear(senderAvatarImageView)
         if (it.senderAvatarPath != null) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 7e08effe..3c6a0b65 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -6,15 +6,19 @@ import com.airbnb.mvrx.ViewModelContext
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
+import im.vector.riotredesign.VectorApplication
 import im.vector.riotredesign.core.platform.VectorViewModel
 import org.koin.android.ext.android.get
 import timber.log.Timber
+import java.text.SimpleDateFormat
+import java.util.*
 
 
 data class MessageActionState(
         val userId: String,
         val senderName: String,
         val messageBody: String,
+        val ts: String?,
         val senderAvatarPath: String? = null)
     : MvRxState
 
@@ -28,6 +32,8 @@ class MessageActionsViewModel(initialState: MessageActionState) : VectorViewMode
 //            return MessageActionsViewModel(state/*,currentSession*/)
 //        }
 
+        val dateFormat = SimpleDateFormat("EEE, d MMM yyyy HH:mm")
+
         override fun initialState(viewModelContext: ViewModelContext): MessageActionState? {
             val currentSession = viewModelContext.activity.get<Session>()
             val parcel = viewModelContext.args as MessageActionsBottomSheet.ParcelableArgs
@@ -36,11 +42,12 @@ class MessageActionsViewModel(initialState: MessageActionState) : VectorViewMode
             val event = currentSession.getRoom(parcel.roomId)?.getTimeLineEvent(parcel.eventId)
             return if (event != null) {
                 val messageContent: MessageContent? = event.root.content.toModel()
-
+                val originTs = event.root.originServerTs
                 MessageActionState(
                         event.root.sender ?: "",
                         parcel.informationData.memberName.toString(),
                         messageContent?.body ?: "",
+                        dateFormat.format(Date(originTs ?: 0)),
                         currentSession.contentUrlResolver().resolveFullSize(parcel.informationData.avatarUrl)
                 )
             } else {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
index 6c975809..260d456c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
@@ -60,7 +60,7 @@ class MessageMenuViewModel(initialState: MessageMenuState) : VectorViewModel<Mes
 
                 if (canQuote(event, messageContent)) {
                     //TODO quote icon
-                    this.add(SimpleAction(ACTION_QUOTE, R.string.quote, R.drawable.ic_material_quote, parcel.eventId))
+                    this.add(SimpleAction(ACTION_QUOTE, R.string.quote, R.drawable.ic_quote, parcel.eventId))
                 }
 
                 if (canReply(event, messageContent)) {
@@ -86,9 +86,14 @@ class MessageMenuViewModel(initialState: MessageMenuState) : VectorViewModel<Mes
 
                 this.add(SimpleAction(VIEW_SOURCE, R.string.view_source, R.drawable.ic_view_source, JSONObject(event.root.toContent()).toString(4)))
                 if (event.isEncrypted()) {
-                    this.add(SimpleAction(VIEW_DECRYPTED_SOURCE, R.string.view_decrypted_source, null, parcel.eventId))
+                    this.add(SimpleAction(VIEW_DECRYPTED_SOURCE, R.string.view_decrypted_source, R.drawable.ic_view_source, parcel.eventId))
                 }
                 this.add(SimpleAction(PERMALINK, R.string.permalink, R.drawable.ic_permalink, parcel.eventId))
+
+                if (currentSession.sessionParams.credentials.userId != event.root.sender) {
+                    //not sent by me
+                    this.add(SimpleAction(ACTION_FLAG, R.string.report_content, R.drawable.ic_flag, parcel.eventId))
+                }
             }
 
             return MessageMenuState(actions)
@@ -159,6 +164,7 @@ class MessageMenuViewModel(initialState: MessageMenuState) : VectorViewModel<Mes
         const val VIEW_SOURCE = "VIEW_SOURCE"
         const val VIEW_DECRYPTED_SOURCE = "VIEW_DECRYPTED_SOURCE"
         const val PERMALINK = "PERMALINK"
+        const val ACTION_FLAG = "ACTION_FLAG"
 
 
     }
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt
index cf763803..34b5dcd6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -29,5 +29,6 @@ data class MessageInformationData(
         val time: CharSequence? = null,
         val avatarUrl: String?,
         val memberName: CharSequence? = null,
+        val userId: String? = null,
         val showInformation: Boolean = true
 ) : Parcelable
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_flag.xml b/vector/src/main/res/drawable/ic_flag.xml
new file mode 100644
index 00000000..5a30c382
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_flag.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="22dp"
+    android:viewportWidth="18"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M1,14s1,-1 4,-1 5,2 8,2 4,-1 4,-1V2s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1v12zM1,21v-7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#9E9E9E"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_permalink.xml b/vector/src/main/res/drawable/ic_permalink.xml
index f8c74537..7c1aae16 100644
--- a/vector/src/main/res/drawable/ic_permalink.xml
+++ b/vector/src/main/res/drawable/ic_permalink.xml
@@ -1,24 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="21dp"
-    android:height="21dp"
-    android:viewportWidth="21"
-    android:viewportHeight="21">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
   <path
-      android:pathData="M7.7782,11.7279L12.7279,6.7782A1,1 0,0 1,14.1421 6.7782L14.1421,6.7782A1,1 0,0 1,14.1421 8.1924L9.1924,13.1421A1,1 0,0 1,7.7782 13.1421L7.7782,13.1421A1,1 0,0 1,7.7782 11.7279z"
-      android:strokeWidth="1"
-      android:fillColor="#9E9E9E"
+      android:pathData="M9,12a5,5 0,0 0,7.54 0.54l3,-3a5,5 0,0 0,-7.07 -7.07l-1.72,1.71"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:strokeColor="#9E9E9E"
+      android:strokeLineCap="round"/>
   <path
-      android:pathData="M6.9248,9.1065C6.7645,9.813 6.8139,10.5708 7.0693,11.2839C6.8715,11.3172 6.6817,11.4102 6.5291,11.5628L3.2857,14.8062C2.8952,15.1967 2.8952,15.8299 3.2857,16.2204L4.6999,17.6346C5.0904,18.0251 5.7236,18.0251 6.1141,17.6346L9.3575,14.3912C9.5102,14.2386 9.6031,14.0488 9.6364,13.851C10.3495,14.1064 11.1073,14.1558 11.8138,13.9955C11.7988,14.4866 11.6039,14.9733 11.229,15.3482L7.0711,19.5061C6.29,20.2871 5.0237,20.2871 4.2426,19.5061L1.4142,16.6777C0.6332,15.8966 0.6332,14.6303 1.4142,13.8492L5.5721,9.6913C5.947,9.3164 6.4337,9.1215 6.9248,9.1065Z"
-      android:strokeWidth="1"
-      android:fillColor="#9E9E9E"
+      android:pathData="M13,10a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M9.6269,6.4044C10.3334,6.2441 11.0913,6.2935 11.8043,6.5489C11.8376,6.351 11.9306,6.1613 12.0832,6.0086L15.3266,2.7653C15.7171,2.3748 16.3503,2.3748 16.7408,2.7653L18.155,4.1795C18.5455,4.57 18.5455,5.2032 18.155,5.5937L14.9117,8.8371C14.759,8.9897 14.5693,9.0827 14.3714,9.116C14.6268,9.829 14.6762,10.5869 14.5159,11.2934C15.0071,11.2784 15.4937,11.0834 15.8686,10.7086L20.0265,6.5506C20.8076,5.7696 20.8076,4.5033 20.0265,3.7222L17.1981,0.8938C16.417,0.1127 15.1507,0.1127 14.3697,0.8938L10.2117,5.0517C9.8369,5.4266 9.6419,5.9132 9.6269,6.4044Z"
-      android:strokeWidth="1"
-      android:fillColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:strokeColor="#9E9E9E"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_quote.xml b/vector/src/main/res/drawable/ic_quote.xml
new file mode 100644
index 00000000..0689651f
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_quote.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="14dp"
+    android:viewportWidth="20"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M19,5H1M19,1H1M10,9H1M10,13H1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#9E9E9E"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_view_source.xml b/vector/src/main/res/drawable/ic_view_source.xml
index f139832b..c78a493d 100644
--- a/vector/src/main/res/drawable/ic_view_source.xml
+++ b/vector/src/main/res/drawable/ic_view_source.xml
@@ -1,24 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="22dp"
-    android:height="17dp"
+    android:height="14dp"
     android:viewportWidth="22"
-    android:viewportHeight="17">
+    android:viewportHeight="14">
   <path
-      android:pathData="M1.9413,8.3353L6.3938,12.3316C6.6985,12.6051 6.7238,13.0739 6.4503,13.3786C6.4325,13.3985 6.4136,13.4174 6.3938,13.4352C6.044,13.7491 5.514,13.7491 5.1643,13.4352L0.2462,9.021C0.0472,8.8423 -0.0327,8.5804 0.0121,8.3353C-0.0327,8.0902 0.0472,7.8283 0.2462,7.6496L5.1643,3.2354C5.514,2.9215 6.044,2.9215 6.3938,3.2354C6.4136,3.2532 6.4325,3.2721 6.4503,3.292C6.7238,3.5967 6.6985,4.0655 6.3938,4.339L1.9413,8.3353Z"
-      android:strokeWidth="1"
-      android:fillColor="#9E9E9E"
+      android:pathData="M15,13l6,-6 -6,-6M7,1L1,7l6,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M19.6987,8.3353L15.2462,12.3316C14.9415,12.6051 14.9161,13.0739 15.1897,13.3786C15.2075,13.3985 15.2263,13.4174 15.2462,13.4352C15.5959,13.7491 16.126,13.7491 16.4757,13.4352L21.3938,9.021C21.5928,8.8423 21.6726,8.5804 21.6279,8.3353C21.6726,8.0902 21.5928,7.8283 21.3938,7.6496L16.4757,3.2354C16.126,2.9215 15.5959,2.9215 15.2462,3.2354C15.2263,3.2532 15.2075,3.2721 15.1897,3.292C14.9161,3.5967 14.9415,4.0655 15.2462,4.339L19.6987,8.3353Z"
-      android:strokeWidth="1"
-      android:fillColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M13,0.0467l2,0l-6.0855,16.9533l-2,0z"
-      android:strokeWidth="1"
-      android:fillColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:strokeColor="#9E9E9E"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_message_actions.xml b/vector/src/main/res/layout/bottom_sheet_message_actions.xml
index f148068f..967bbe42 100644
--- a/vector/src/main/res/layout/bottom_sheet_message_actions.xml
+++ b/vector/src/main/res/layout/bottom_sheet_message_actions.xml
@@ -22,8 +22,8 @@
                 android:layout_height="60dp"
                 android:layout_margin="@dimen/layout_horizontal_margin"
                 android:adjustViewBounds="true"
-                android:contentDescription="@string/avatar"
                 android:background="@drawable/circle"
+                android:contentDescription="@string/avatar"
                 android:scaleType="centerCrop"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -37,8 +37,8 @@
                 android:layout_gravity="start"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:layout_marginRight="@dimen/layout_horizontal_margin"
                 android:ellipsize="end"
                 android:fontFamily="sans-serif-bold"
                 android:singleLine="true"
@@ -53,24 +53,37 @@
 
                 android:id="@+id/bottom_sheet_message_preview_body"
                 android:layout_width="0dp"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="start"
                 android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginBottom="@dimen/layout_vertical_margin"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:layout_marginRight="@dimen/layout_horizontal_margin"
+                android:layout_marginBottom="4dp"
                 android:ellipsize="end"
-                android:maxLines="2"
+                android:maxLines="3"
                 android:textColor="?android:textColorSecondary"
                 android:textIsSelectable="false"
                 android:textSize="14sp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/bottom_sheet_message_preview_timestamp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
                 app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
-                tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. " />
+                tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. " />
 
+            <TextView
+                android:id="@+id/bottom_sheet_message_preview_timestamp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:layout_marginRight="@dimen/layout_horizontal_margin"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp"
+                android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_body"
+                tools:text="Friday 8pm" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
@@ -94,15 +107,5 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <!--<com.airbnb.epoxy.EpoxyRecyclerView-->
-        <!--android:visibility="invisible"-->
-        <!--android:id="@+id/bottom_sheet_actions_list"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--tools:itemCount="20"-->
-        <!--android:minHeight="80dp"-->
-        <!--tools:listitem="@layout/adapter_item_action">-->
-
-        <!--</com.airbnb.epoxy.EpoxyRecyclerView>-->
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/layout/item_timeline_event_image_video_message.xml b/vector/src/main/res/layout/item_timeline_event_image_video_message.xml
index b1da5882..17dd4f97 100644
--- a/vector/src/main/res/layout/item_timeline_event_image_video_message.xml
+++ b/vector/src/main/res/layout/item_timeline_event_image_video_message.xml
@@ -25,8 +25,8 @@
 
     <ImageView
         android:id="@+id/messageAvatarImageView"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -37,8 +37,8 @@
         android:id="@+id/messageMemberNameView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="64dp"
-        android:layout_marginLeft="64dp"
+        android:layout_marginStart="56dp"
+        android:layout_marginLeft="56dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice.xml b/vector/src/main/res/layout/item_timeline_event_notice.xml
index db4162ad..318d5bbd 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice.xml
@@ -12,8 +12,8 @@
         android:id="@+id/itemNoticeAvatarView"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginStart="64dp"
-        android:layout_marginLeft="64dp"
+        android:layout_marginStart="56dp"
+        android:layout_marginLeft="56dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message.xml b/vector/src/main/res/layout/item_timeline_event_text_message.xml
index b60cce8f..f63a55f3 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message.xml
@@ -11,8 +11,8 @@
 
     <ImageView
         android:id="@+id/messageAvatarImageView"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,8 +23,8 @@
         android:id="@+id/messageMemberNameView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="64dp"
-        android:layout_marginLeft="64dp"
+        android:layout_marginStart="56dp"
+        android:layout_marginLeft="56dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
@@ -56,8 +56,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:foreground="?attr/selectableItemBackgroundBorderless"
-        android:layout_marginStart="64dp"
-        android:layout_marginLeft="64dp"
+        android:layout_marginStart="56dp"
+        android:layout_marginLeft="56dp"
         android:layout_marginBottom="8dp"
         android:duplicateParentState="true"
         android:textColor="@color/dark_grey"