terminal: version 1.4.1 (#486 )

core: update simplexmq hash (pragmas) (#484 )
android: change font (#426 )
2024-12-17 17:20:21 +01:00 · 2022-03-31 16:08:07 +04:00 · 2022-03-31 15:32:42 +04:00 · 2022-03-30 23:35:36 +04:00 · 2022-03-30 20:04:25 +01:00 · 2022-03-30 20:37:47 +04:00
101 changed files with 5514 additions and 1361 deletions
@@ -12,9 +12,11 @@
 &nbsp;
 [![Android app](https://github.com/simplex-chat/.github/blob/master/profile/images/google_play.svg)](https://play.google.com/store/apps/details?id=chat.simplex.app)
 &nbsp;
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/f_droid.svg" alt="F-Droid" height="41">](https://app.simplex.chat)
+&nbsp;
 [<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
 &nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="iOS TestFlight" height="41">](https://github.com/simplex-chat/website/raw/master/simplex.apk)
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/website/raw/master/simplex.apk)

 - 🖲 Protects your messages and metadata - who you talk to and when.
 - 🔐 Double ratchet encryption.
@@ -11,8 +11,8 @@ android {
        applicationId "chat.simplex.app"
        minSdk 29
        targetSdk 32
-        versionCode 11
-        versionName "1.2"
+        versionCode 19
+        versionName "1.4"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
@@ -41,6 +41,7 @@ android {
    kotlinOptions {
        jvmTarget = '1.8'
        freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi"
+        freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
        freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi"
        freeCompilerArgs += "-opt-in=androidx.compose.material.ExperimentalMaterialApi"
        freeCompilerArgs += "-opt-in=com.google.accompanist.insets.ExperimentalAnimatedInsets"
@@ -4,6 +4,11 @@

  <uses-feature android:name="android.hardware.camera" />
  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.VIBRATE"/>
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -15,6 +20,8 @@
    android:label="@string/app_name"
    android:supportsRtl="true"
    android:theme="@style/Theme.SimpleX">
+
+    <!-- Main activity -->
    <activity
      android:name=".MainActivity"
      android:exported="true"
@@ -26,6 +33,7 @@
        <category android:name="android.intent.category.LAUNCHER" />
      </intent-filter>

+      <!-- open simplex:/ connection URI -->
      <intent-filter>
        <action android:name="android.intent.action.VIEW" />
        <category android:name="android.intent.category.DEFAULT" />
@@ -33,6 +41,39 @@
        <data android:scheme="simplex" />
      </intent-filter>
    </activity>
-  </application>

-</manifest>
+    <provider
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="chat.simplex.app.provider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+      <meta-data
+          android:name="android.support.FILE_PROVIDER_PATHS"
+          android:resource="@xml/file_paths"/>
+    </provider>
+
+    <!-- SimplexService foreground service -->
+    <service
+        android:name=".SimplexService"
+        android:enabled="true"
+        android:exported="false"
+        android:stopWithTask="false">
+    </service>
+
+    <!-- SimplexService restart on reboot -->
+    <receiver
+        android:name=".SimplexService$StartReceiver"
+        android:enabled="true"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED"/>
+      </intent-filter>
+    </receiver>
+
+    <!-- SimplexService restart on destruction -->
+    <receiver
+        android:name=".SimplexService$AutoRestartReceiver"
+        android:enabled="true"
+        android:exported="false"/>
+  </application>
+</manifest>
@@ -16,6 +16,7 @@ import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
+import androidx.work.*
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.NtfManager
 import chat.simplex.app.ui.theme.SimpleXTheme
@@ -27,17 +28,18 @@ import chat.simplex.app.views.chatlist.openChat
 import chat.simplex.app.views.helpers.AlertManager
 import chat.simplex.app.views.helpers.withApi
 import chat.simplex.app.views.newchat.*
+import java.util.concurrent.TimeUnit

 //import kotlinx.serialization.decodeFromString

 class MainActivity: ComponentActivity() {
  private val vm by viewModels<SimplexViewModel>()
+  private val chatController by lazy { (application as SimplexApp).chatController }

  override fun onCreate(savedInstanceState: Bundle?) {
    super.onCreate(savedInstanceState)
 //    testJson()
    processIntent(intent, vm.chatModel)
-//    vm.app.initiateBackgroundWork()
    setContent {
      SimpleXTheme {
        Surface(
@@ -49,6 +51,25 @@ class MainActivity: ComponentActivity() {
        }
      }
    }
+    schedulePeriodicServiceRestartWorker()
+  }
+
+  private fun schedulePeriodicServiceRestartWorker() {
+    val workerVersion = chatController.getAutoRestartWorkerVersion()
+    val workPolicy = if (workerVersion == SimplexService.SERVICE_START_WORKER_VERSION) {
+      Log.d(TAG, "ServiceStartWorker version matches: choosing KEEP as existing work policy")
+      ExistingPeriodicWorkPolicy.KEEP
+    } else {
+      Log.d(TAG, "ServiceStartWorker version DOES NOT MATCH: choosing REPLACE as existing work policy")
+      chatController.setAutoRestartWorkerVersion(SimplexService.SERVICE_START_WORKER_VERSION)
+      ExistingPeriodicWorkPolicy.REPLACE
+    }
+    val work = PeriodicWorkRequestBuilder<SimplexService.ServiceStartWorker>(SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES, TimeUnit.MINUTES)
+      .addTag(SimplexService.TAG)
+      .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
+      .build()
+    Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
+    WorkManager.getInstance(this)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
  }
 }

@@ -112,9 +133,8 @@ fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
 }

 //fun testJson() {
-//  val str = """
-//    {}
+//  val str: String = """
 //  """.trimIndent()
 //
-//  println(json.decodeFromString<ChatItem>(str))
+//  println(json.decodeFromString<APIResponse>(str))
 //}
@@ -3,6 +3,7 @@ package chat.simplex.app
 import android.app.Application
 import android.net.LocalServerSocket
 import android.util.Log
+import androidx.lifecycle.*
 import chat.simplex.app.model.*
 import chat.simplex.app.views.helpers.withApi
 import java.io.BufferedReader
@@ -24,32 +25,44 @@ external fun chatInit(path: String): ChatCtrl
 external fun chatSendCmd(ctrl: ChatCtrl, msg: String) : String
 external fun chatRecvMsg(ctrl: ChatCtrl) : String

-//class SimplexApp: Application(), LifecycleEventObserver {
-class SimplexApp: Application() {
-  private lateinit var controller: ChatController
-  lateinit var chatModel: ChatModel
-  private lateinit var ntfManager: NtfManager
+class SimplexApp: Application(), LifecycleEventObserver {
+  val chatController: ChatController by lazy {
+    val ctrl = chatInit(applicationContext.filesDir.toString())
+    ChatController(ctrl, ntfManager, applicationContext)
+  }
+
+  val chatModel: ChatModel by lazy {
+    chatController.chatModel
+  }
+
+  private val ntfManager: NtfManager by lazy {
+    NtfManager(applicationContext)
+  }

  override fun onCreate() {
    super.onCreate()
-//    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-    ntfManager = NtfManager(applicationContext)
-    val ctrl = chatInit(applicationContext.filesDir.toString())
-    controller = ChatController(ctrl, ntfManager, applicationContext)
-    chatModel = controller.chatModel
+    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
    withApi {
-      val user = controller.apiGetActiveUser()
-      if (user != null) controller.startChat(user)
+      val user = chatController.apiGetActiveUser()
+      if (user != null) {
+        chatController.startChat(user)
+        SimplexService.start(applicationContext)
+        chatController.showBackgroundServiceNotice()
+      }
    }
  }

-//  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-//    Log.d(TAG, "onStateChanged: $event")
-//    if (event == Lifecycle.Event.ON_STOP) {
-//      Log.e(TAG, "BGManager schedule ${Clock.System.now()}")
-//      BGManager.schedule(applicationContext)
-//    }
-//  }
+  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+    Log.d(TAG, "onStateChanged: $event")
+    withApi {
+      when (event) {
+        Lifecycle.Event.ON_STOP ->
+          if (!chatController.getRunServiceInBackground()) SimplexService.stop(applicationContext)
+        Lifecycle.Event.ON_START ->
+          SimplexService.start(applicationContext)
+      }
+    }
+  }

  companion object {
    init {
@@ -0,0 +1,242 @@
+package chat.simplex.app
+
+import android.app.*
+import android.content.*
+import android.os.*
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import androidx.work.*
+import chat.simplex.app.views.helpers.withApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+// based on:
+// https://robertohuertas.com/2019/06/29/android_foreground_services/
+// https://github.com/binwiederhier/ntfy-android/blob/main/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
+
+class SimplexService: Service() {
+  private var wakeLock: PowerManager.WakeLock? = null
+  private var isServiceStarted = false
+  private var isStartingService = false
+  private var notificationManager: NotificationManager? = null
+  private var serviceNotification: Notification? = null
+  private val chatController by lazy { (application as SimplexApp).chatController }
+
+  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+    Log.d(TAG, "onStartCommand startId: $startId")
+    if (intent != null) {
+      val action = intent.action
+      Log.d(TAG, "intent action $action")
+      when (action) {
+        Action.START.name -> startService()
+        Action.STOP.name -> stopService()
+        else -> Log.e(TAG, "No action in the intent")
+      }
+    } else {
+      Log.d(TAG, "null intent. Probably restarted by the system.")
+    }
+    return START_STICKY // to restart if killed
+  }
+
+  override fun onCreate() {
+    super.onCreate()
+    Log.d(TAG, "Simplex service created")
+    val title = getString(R.string.simplex_service_notification_title)
+    val text = getString(R.string.simplex_service_notification_text)
+    notificationManager = createNotificationChannel()
+    serviceNotification = createNotification(title, text)
+
+    startForeground(SIMPLEX_SERVICE_ID, serviceNotification)
+  }
+
+  override fun onDestroy() {
+    Log.d(TAG, "Simplex service destroyed")
+    stopService()
+    sendBroadcast(Intent(this, AutoRestartReceiver::class.java)) // Restart if necessary!
+    super.onDestroy()
+  }
+
+  private fun startService() {
+    Log.d(TAG, "SimplexService startService")
+    if (isServiceStarted || isStartingService) return
+    val self = this
+    isStartingService = true
+    withApi {
+      try {
+        val user = chatController.apiGetActiveUser()
+        if (user != null) {
+          Log.w(TAG, "Starting foreground service")
+          chatController.startChat(user)
+          chatController.startReceiver()
+          isServiceStarted = true
+          saveServiceState(self, ServiceState.STARTED)
+          wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+            newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG).apply {
+              acquire()
+            }
+          }
+        }
+      } finally {
+        isStartingService = false
+      }
+    }
+  }
+
+  private fun stopService() {
+    Log.d(TAG, "Stopping foreground service")
+    try {
+      wakeLock?.let {
+        while (it.isHeld) it.release() // release all, in case acquired more than once
+      }
+      wakeLock = null
+      stopForeground(true)
+      stopSelf()
+    } catch (e: Exception) {
+      Log.d(TAG, "Service stopped without being started: ${e.message}")
+    }
+
+    isServiceStarted = false
+    saveServiceState(this, ServiceState.STOPPED)
+  }
+
+  private fun createNotificationChannel(): NotificationManager? {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+      val channel = NotificationChannel(NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW).let {
+        it.setShowBadge(false) // no long-press badge
+        it
+      }
+      notificationManager.createNotificationChannel(channel)
+      return notificationManager
+    }
+    return null
+  }
+
+  private fun createNotification(title: String, text: String): Notification {
+    val pendingIntent: PendingIntent = Intent(this, MainActivity::class.java).let { notificationIntent ->
+      PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
+    }
+    return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
+      .setSmallIcon(R.drawable.ntf_icon)
+      .setColor(0x88FFFF)
+      .setContentTitle(title)
+      .setContentText(text)
+      .setContentIntent(pendingIntent)
+      .setSound(null)
+      .setShowWhen(false) // no date/time
+      .build()
+  }
+
+  override fun onBind(intent: Intent): IBinder? {
+    return null // no binding
+  }
+
+  // re-schedules the task when "Clear recent apps" is pressed
+  override fun onTaskRemoved(rootIntent: Intent) {
+    val restartServiceIntent = Intent(applicationContext, SimplexService::class.java).also {
+      it.setPackage(packageName)
+    };
+    val restartServicePendingIntent: PendingIntent = PendingIntent.getService(this, 1, restartServiceIntent, PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE);
+    applicationContext.getSystemService(Context.ALARM_SERVICE);
+    val alarmService: AlarmManager = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager;
+    alarmService.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + 1000, restartServicePendingIntent);
+  }
+
+  // restart on reboot
+  class StartReceiver: BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+      Log.d(TAG, "StartReceiver: onReceive called")
+      scheduleStart(context)
+    }
+  }
+
+  // restart on destruction
+  class AutoRestartReceiver: BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+      Log.d(TAG, "AutoRestartReceiver: onReceive called")
+      scheduleStart(context)
+    }
+  }
+
+  class ServiceStartWorker(private val context: Context, params: WorkerParameters): CoroutineWorker(context, params) {
+    override suspend fun doWork(): Result {
+      val id = this.id
+      if (context.applicationContext !is Application) {
+        Log.d(TAG, "ServiceStartWorker: Failed, no application found (work ID: $id)")
+        return Result.failure()
+      }
+      if (getServiceState(context) == ServiceState.STARTED) {
+        Log.d(TAG, "ServiceStartWorker: Starting foreground service (work ID: $id)")
+        start(context)
+      }
+      return Result.success()
+    }
+  }
+
+  enum class Action {
+    START,
+    STOP
+  }
+
+  enum class ServiceState {
+    STARTED,
+    STOPPED,
+  }
+
+  companion object {
+    const val TAG = "SIMPLEX_SERVICE"
+    const val NOTIFICATION_CHANNEL_ID = "chat.simplex.app.SIMPLEX_SERVICE_NOTIFICATION"
+    const val NOTIFICATION_CHANNEL_NAME = "SimpleX Chat service"
+    const val SIMPLEX_SERVICE_ID = 6789
+    const val SERVICE_START_WORKER_VERSION = BuildConfig.VERSION_CODE
+    const val SERVICE_START_WORKER_INTERVAL_MINUTES = 3 * 60L
+    const val SERVICE_START_WORKER_WORK_NAME_PERIODIC = "SimplexAutoRestartWorkerPeriodic" // Do not change!
+
+    private const val WAKE_LOCK_TAG = "SimplexService::lock"
+    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_SERVICE_PREFS"
+    private const val SHARED_PREFS_SERVICE_STATE = "SIMPLEX_SERVICE_STATE"
+    private const val WORK_NAME_ONCE = "ServiceStartWorkerOnce"
+
+    fun scheduleStart(context: Context) {
+      Log.d(TAG, "Enqueuing work to start subscriber service")
+      val workManager = WorkManager.getInstance(context)
+      val startServiceRequest = OneTimeWorkRequest.Builder(ServiceStartWorker::class.java).build()
+      workManager.enqueueUniqueWork(WORK_NAME_ONCE, ExistingWorkPolicy.KEEP, startServiceRequest) // Unique avoids races!
+    }
+
+    suspend fun start(context: Context) = serviceAction(context, Action.START)
+
+    suspend fun stop(context: Context) = serviceAction(context, Action.STOP)
+
+    private suspend fun serviceAction(context: Context, action: Action) {
+      Log.d(TAG, "SimplexService serviceAction: ${action.name}")
+      withContext(Dispatchers.IO) {
+        Intent(context, SimplexService::class.java).also {
+          it.action = action.name
+          ContextCompat.startForegroundService(context, it)
+        }
+      }
+    }
+
+    fun restart(context: Context) {
+      Intent(context, SimplexService::class.java).also { intent ->
+        context.stopService(intent) // Service will auto-restart
+      }
+    }
+
+    fun saveServiceState(context: Context, state: ServiceState) {
+      getPreferences(context).edit()
+        .putString(SHARED_PREFS_SERVICE_STATE, state.name)
+        .apply()
+    }
+
+    fun getServiceState(context: Context): ServiceState {
+      val value = getPreferences(context)
+        .getString(SHARED_PREFS_SERVICE_STATE, ServiceState.STOPPED.name)
+      return ServiceState.valueOf(value!!)
+    }
+
+    private fun getPreferences(context: Context): SharedPreferences = context.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
+  }
+}
@@ -1,46 +0,0 @@
-package chat.simplex.app.model
-
-import android.content.Context
-import android.util.Log
-import androidx.work.*
-import chat.simplex.app.TAG
-import chat.simplex.app.chatRecvMsg
-import kotlinx.datetime.Clock
-import java.time.Duration
-import java.util.concurrent.TimeUnit
-
-class BGManager(appContext: Context, workerParams: WorkerParameters): //, ctrl: ChatCtrl):
-  Worker(appContext, workerParams) {
-//  val controller = ctrl
-
-  init {}
-
-  override fun doWork(): Result {
-    Log.e(TAG, "BGManager doWork ${Clock.System.now()}")
-    schedule(applicationContext)
-    getNewItems()
-    return Result.success()
-  }
-
-  private fun getNewItems() {
-    Log.e(TAG, "BGManager getNewItems")
-//    val json = chatRecvMsg(controller)
-//    val r = APIResponse.decodeStr(json).resp
-//    Log.d(TAG, "chatRecvMsg: ${r.responseType}")
-  }
-
-  companion object {
-    val constraints = Constraints.Builder()
-      .setRequiredNetworkType(NetworkType.CONNECTED)
-      .build()
-
-    fun schedule(appContext: Context) {
-      val request = OneTimeWorkRequestBuilder<BGManager>()
-        .setInitialDelay(Duration.ofMinutes(10))
-        .setConstraints(constraints)
-        .build()
-      WorkManager.getInstance(appContext)
-        .enqueue(request)
-    }
-  }
-}
@@ -29,6 +29,7 @@ class ChatModel(val controller: ChatController) {
  var userSMPServers = mutableStateOf<(List<String>)?>(null)
  // set when app is opened via contact or invitation URI
  var appOpenUrl = mutableStateOf<Uri?>(null)
+  var runServiceInBackground = mutableStateOf(true)

  fun updateUserProfile(profile: Profile) {
    val user = currentUser.value
@@ -102,6 +103,57 @@ class ChatModel(val controller: ChatController) {
    }
  }

+  fun upsertChatItem(cInfo: ChatInfo, cItem: ChatItem): Boolean {
+    // update previews
+    val i = getChatIndex(cInfo.id)
+    val chat: Chat
+    val res: Boolean
+    if (i >= 0) {
+      chat = chats[i]
+      val pItem = chat.chatItems.last()
+      if (pItem.id == cItem.id) {
+        chats[i] = chat.copy(chatItems = arrayListOf(cItem))
+      }
+      res = false
+    } else {
+      addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf(cItem)))
+      res = true
+    }
+    // update current chat
+    if (chatId.value == cInfo.id) {
+      val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
+      if (itemIndex >= 0) {
+        chatItems[itemIndex] = cItem
+        return false
+      } else {
+        chatItems.add(cItem)
+        return true
+      }
+    } else {
+      return res
+    }
+  }
+
+  fun removeChatItem(cInfo: ChatInfo, cItem: ChatItem) {
+    // update previews
+    val i = getChatIndex(cInfo.id)
+    val chat: Chat
+    if (i >= 0) {
+      chat = chats[i]
+      val pItem = chat.chatItems.last()
+      if (pItem.id == cItem.id) {
+        chats[i] = chat.copy(chatItems = arrayListOf(cItem))
+      }
+    }
+    // remove from current chat
+    if (chatId.value == cInfo.id) {
+      val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
+      if (itemIndex >= 0) {
+        chatItems.removeAt(itemIndex)
+      }
+    }
+  }
+
  fun markChatItemsRead(cInfo: ChatInfo) {
    val chatIdx = getChatIndex(cInfo.id)
    // update current chat
@@ -122,42 +174,13 @@ class ChatModel(val controller: ChatController) {
    }

  }
-//
-//  func upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
-//    // update previews
-//    var res: Bool
-//    if let chat = getChat(cInfo.id) {
-//      if let pItem = chat.chatItems.last, pItem.id == cItem.id {
-//      chat.chatItems = [cItem]
-//    }
-//      res = false
-//    } else {
-//      addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
-//      res = true
-//    }
-//    // update current chat
-//    if chatId == cInfo.id {
-//      if let i = chatItems.firstIndex(where: { $0.id == cItem.id }) {
-//      withAnimation(.default) {
-//      self.chatItems[i] = cItem
-//    }
-//      return false
-//    } else {
-//      withAnimation { chatItems.append(cItem) }
-//      return true
-//    }
-//    } else {
-//      return res
-//    }
-//  }
-//
-//
+
 //  func popChat(_ id: String) {
 //    if let i = getChatIndex(id) {
 //      popChat_(i)
 //    }
 //  }
-//
+
  private fun popChat_(i: Int) {
    val chat = chats.removeAt(i)
    chats.add(index = 0, chat)
@@ -191,6 +214,7 @@ data class User(
 ): NamedChat {
  override val displayName: String get() = profile.displayName
  override val fullName: String get() = profile.fullName
+  override val image: String? get() = profile.image

  companion object {
    val sampleData = User(
@@ -208,6 +232,7 @@ typealias ChatId = String
 interface NamedChat {
  val displayName: String
  val fullName: String
+  val image: String?
  val chatViewName: String
    get() = displayName + (if (fullName == "" || fullName == displayName) "" else " / $fullName")
 }
@@ -241,9 +266,9 @@ data class Chat (
    val statusString: String get() = if (this is Connected) "Server connected" else "Connecting server…"
    val statusExplanation: String get() =
      when {
-        this is Connected -> "You are connected to the server you use to receve messages from this contact."
-        this is Error -> "Trying to connect to the server you use to receve messages from this contact (error: $error)."
-        else -> "Trying to connect to the server you use to receve messages from this contact."
+        this is Connected -> "You are connected to the server used to receive messages from this contact."
+        this is Error -> "Trying to connect to the server used to receive messages from this contact (error: $error)."
+        else -> "Trying to connect to the server used to receive messages from this contact."
      }

    @Serializable @SerialName("unknown") class Unknown: NetworkStatus()
@@ -272,6 +297,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val createdAt get() = contact.createdAt
    override val displayName get() = contact.displayName
    override val fullName get() = contact.fullName
+    override val image get() = contact.image

    companion object {
      val sampleData = Direct(Contact.sampleData)
@@ -288,6 +314,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val createdAt get() = groupInfo.createdAt
    override val displayName get() = groupInfo.displayName
    override val fullName get() = groupInfo.fullName
+    override val image get() = groupInfo.image

    companion object {
      val sampleData = Group(GroupInfo.sampleData)
@@ -304,6 +331,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val createdAt get() = contactRequest.createdAt
    override val displayName get() = contactRequest.displayName
    override val fullName get() = contactRequest.fullName
+    override val image get() = contactRequest.image

    companion object {
      val sampleData = ContactRequest(UserContactRequest.sampleData)
@@ -326,6 +354,7 @@ class Contact(
  override val ready get() = activeConn.connStatus == "ready" || activeConn.connStatus == "snd-ready"
  override val displayName get() = profile.displayName
  override val fullName get() = profile.fullName
+  override val image get() = profile.image

  companion object {
    val sampleData = Contact(
@@ -354,7 +383,8 @@ class Connection(val connStatus: String) {
@Serializable
 class Profile(
  val displayName: String,
-  val fullName: String
+  val fullName: String,
+  val image: String? = null
  ) {
  companion object {
    val sampleData = Profile(
@@ -377,6 +407,7 @@ class GroupInfo (
  override val ready get() = true
  override val displayName get() = groupProfile.displayName
  override val fullName get() = groupProfile.fullName
+  override val image get() = groupProfile.image

  companion object {
    val sampleData = GroupInfo(
@@ -391,7 +422,8 @@ class GroupInfo (
@Serializable
 class GroupProfile (
  override val displayName: String,
-  override val fullName: String
+  override val fullName: String,
+  override val image: String? = null
 ): NamedChat {
  companion object {
    val sampleData = GroupProfile(
@@ -444,6 +476,7 @@ class UserContactRequest (
  override val ready get() = true
  override val displayName get() = profile.displayName
  override val fullName get() = profile.fullName
+  override val image get() = profile.image

  companion object {
    val sampleData = UserContactRequest(
@@ -466,24 +499,62 @@ data class ChatItem (
  val chatDir: CIDirection,
  val meta: CIMeta,
  val content: CIContent,
-  val formattedText: List<FormattedText>? = null
+  val formattedText: List<FormattedText>? = null,
+  val quotedItem: CIQuote? = null
 ) {
  val id: Long get() = meta.itemId
  val timestampText: String get() = meta.timestampText
  val isRcvNew: Boolean get() = meta.itemStatus is CIStatus.RcvNew

+  val memberDisplayName: String? get() =
+    if (chatDir is CIDirection.GroupRcv) chatDir.groupMember.memberProfile.displayName
+    else null
+
+  val isMsgContent: Boolean get() =
+    when (content) {
+      is CIContent.SndMsgContent -> true
+      is CIContent.RcvMsgContent -> true
+      else -> false
+    }
+
+  val isDeletedContent: Boolean get() =
+    when (content) {
+      is CIContent.SndDeleted -> true
+      is CIContent.RcvDeleted -> true
+      else -> false
+    }
+
  companion object {
    fun getSampleData(
      id: Long = 1,
      dir: CIDirection = CIDirection.DirectSnd(),
      ts: Instant = Clock.System.now(),
      text: String = "hello\nthere",
-      status: CIStatus = CIStatus.SndNew()
+      status: CIStatus = CIStatus.SndNew(),
+      quotedItem: CIQuote? = null,
+      itemDeleted: Boolean = false,
+      itemEdited: Boolean = false,
+      editable: Boolean = true
    ) =
      ChatItem(
        chatDir = dir,
-        meta = CIMeta.getSample(id, ts, text, status),
-        content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text))
+        meta = CIMeta.getSample(id, ts, text, status, itemDeleted, itemEdited, editable),
+        content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
+        quotedItem = quotedItem
+      )
+
+    fun getDeletedContentSampleData(
+      id: Long = 1,
+      dir: CIDirection = CIDirection.DirectRcv(),
+      ts: Instant = Clock.System.now(),
+      text: String = "this item is deleted",
+      status: CIStatus = CIStatus.RcvRead()
+    ) =
+      ChatItem(
+        chatDir = dir,
+        meta = CIMeta.getSample(id, ts, text, status, false, false, false),
+        content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
+        quotedItem = null
      )
  }
 }
@@ -519,18 +590,27 @@ data class CIMeta (
  val itemTs: Instant,
  val itemText: String,
  val itemStatus: CIStatus,
-  val createdAt: Instant
+  val createdAt: Instant,
+  val itemDeleted: Boolean,
+  val itemEdited: Boolean,
+  val editable: Boolean
 ) {
  val timestampText: String get() = getTimestampText(itemTs)

  companion object {
-    fun getSample(id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew()): CIMeta =
+    fun getSample(
+      id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(),
+      itemDeleted: Boolean = false, itemEdited: Boolean = false, editable: Boolean = true
+    ): CIMeta =
      CIMeta(
        itemId = id,
        itemTs = ts,
        itemText = text,
        itemStatus = status,
-        createdAt = ts
+        createdAt = ts,
+        itemDeleted = itemDeleted,
+        itemEdited = itemEdited,
+        editable = editable
      )
  }
 }
@@ -567,8 +647,18 @@ sealed class CIStatus {
 }

@Serializable
-sealed class CIContent {
-  abstract val text: String
+enum class CIDeleteMode(val deleteMode: String) {
+  @SerialName("internal") cidmInternal("internal"),
+  @SerialName("broadcast") cidmBroadcast("broadcast");
+}
+
+interface ItemContent {
+  val text: String
+}
+
+@Serializable
+sealed class CIContent: ItemContent {
+  abstract override val text: String

  @Serializable @SerialName("sndMsgContent")
  class SndMsgContent(val msgContent: MsgContent): CIContent() {
@@ -580,6 +670,16 @@ sealed class CIContent {
    override val text get() = msgContent.text
  }

+  @Serializable @SerialName("sndDeleted")
+  class SndDeleted(val deleteMode: CIDeleteMode): CIContent() {
+    override val text get() = "deleted"
+  }
+
+  @Serializable @SerialName("rcvDeleted")
+  class RcvDeleted(val deleteMode: CIDeleteMode): CIContent() {
+    override val text get() = "deleted"
+  }
+
  @Serializable @SerialName("sndFileInvitation")
  class SndFileInvitation(val fileId: Long, val filePath: String): CIContent() {
    override val text get() = "sending files is not supported yet"
@@ -591,6 +691,31 @@ sealed class CIContent {
  }
 }

+@Serializable
+class CIQuote (
+  val chatDir: CIDirection? = null,
+  val itemId: Long? = null,
+  val sharedMsgId: String? = null,
+  val sentAt: Instant,
+  val content: MsgContent,
+  val formattedText: List<FormattedText>? = null
+): ItemContent {
+  override val text: String get() = content.text
+
+  fun sender(user: User): String? = when (chatDir) {
+    is CIDirection.DirectSnd -> "you"
+    is CIDirection.DirectRcv -> null
+    is CIDirection.GroupSnd -> user.displayName
+    is CIDirection.GroupRcv -> chatDir.groupMember.memberProfile.displayName
+    null -> null
+  }
+
+  companion object {
+    fun getSample(itemId: Long?, sentAt: Instant, text: String, chatDir: CIDirection?): CIQuote =
+      CIQuote(chatDir = chatDir, itemId = itemId, sentAt = sentAt, content = MsgContent.MCText(text))
+  }
+}
+
@Serializable(with = MsgContentSerializer::class)
 sealed class MsgContent {
  abstract val text: String
@@ -605,6 +730,7 @@ sealed class MsgContent {
 }

 object MsgContentSerializer : KSerializer<MsgContent> {
+  @OptIn(InternalSerializationApi::class)
  override val descriptor: SerialDescriptor = buildSerialDescriptor("MsgContent", PolymorphicKind.SEALED) {
    element("MCText", buildClassSerialDescriptor("MCText") {
      element<String>("text")
@@ -36,7 +36,7 @@ class NtfManager(val context: Context) {

    val notification = NotificationCompat.Builder(context, MessageChannel)
      .setContentTitle(cInfo.displayName)
-      .setContentText(cItem.content.text)
+      .setContentText(hideSecrets(cItem))
      .setPriority(NotificationCompat.PRIORITY_HIGH)
      .setGroup(MessageGroup)
      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
@@ -62,6 +62,19 @@ class NtfManager(val context: Context) {
    }
  }

+  private fun hideSecrets(cItem: ChatItem): String {
+    val md = cItem.formattedText
+    return if (md == null) {
+      cItem.content.text
+    } else {
+      var res = ""
+      for (ft in md) {
+        res += if (ft.format is Format.Secret) "..." else ft.text
+      }
+      res
+    }
+  }
+
  private fun getMsgPendingIntent(cInfo: ChatInfo) : PendingIntent{
    Log.d(TAG, "getMsgPendingIntent ${cInfo.id}")
    val uniqueInt = (System.currentTimeMillis() and 0xfffffff).toInt()
@@ -3,8 +3,17 @@ package chat.simplex.app.model
 import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo
 import android.content.Context
+import android.content.SharedPreferences
 import android.util.Log
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
 import chat.simplex.app.*
 import chat.simplex.app.views.helpers.AlertManager
 import chat.simplex.app.views.helpers.withApi
@@ -19,19 +28,25 @@ import kotlin.concurrent.thread

 typealias ChatCtrl = Long

-open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val appContext: Context) {
+open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: NtfManager, val appContext: Context) {
  var chatModel = ChatModel(this)
+  private val sharedPreferences: SharedPreferences  = appContext.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)

-  suspend fun startChat(u: User) {
-    Log.d(TAG, "user: $u")
+  init {
+    chatModel.runServiceInBackground.value = getRunServiceInBackground()
+  }
+
+  suspend fun startChat(user: User) {
+    Log.d(TAG, "user: $user")
    try {
      apiStartChat()
      chatModel.userAddress.value = apiGetUserAddress()
      chatModel.userSMPServers.value = getUserSMPServers()
-      chatModel.chats.addAll(apiGetChats())
-      chatModel.currentUser = mutableStateOf(u)
+      val chats = apiGetChats()
+      chatModel.chats.clear()
+      chatModel.chats.addAll(chats)
+      chatModel.currentUser = mutableStateOf(user)
      chatModel.userCreated.value = true
-      startReceiver()
      Log.d(TAG, "started chat")
    } catch(e: Error) {
      Log.e(TAG, "failed starting chat $e")
@@ -40,6 +55,7 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
  }

  fun startReceiver() {
+    Log.d(TAG, "ChatController startReceiver")
    thread(name="receiver") {
      withApi { recvMspLoop() }
    }
@@ -105,7 +121,7 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap

  suspend fun apiStartChat() {
    val r = sendCmd(CC.StartChat())
-    if (r is CR.ChatStarted ) return
+    if (r is CR.ChatStarted || r is CR.ChatRunning) return
    throw Error("failed starting chat: ${r.responseType} ${r.details}")
  }

@@ -122,13 +138,29 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
    return null
  }

-  suspend fun apiSendMessage(type: ChatType, id: Long, mc: MsgContent): AChatItem? {
-    val r = sendCmd(CC.ApiSendMessage(type, id, mc))
+  suspend fun apiSendMessage(type: ChatType, id: Long, quotedItemId: Long? = null, mc: MsgContent): AChatItem? {
+    val cmd = if (quotedItemId == null) CC.ApiSendMessage(type, id, mc)
+              else CC.ApiSendMessageQuote(type, id, quotedItemId, mc)
+    val r = sendCmd(cmd)
    if (r is CR.NewChatItem ) return r.chatItem
    Log.e(TAG, "apiSendMessage bad response: ${r.responseType} ${r.details}")
    return null
  }

+  suspend fun apiUpdateChatItem(type: ChatType, id: Long, itemId: Long, mc: MsgContent): AChatItem? {
+    val r = sendCmd(CC.ApiUpdateChatItem(type, id, itemId, mc))
+    if (r is CR.ChatItemUpdated) return r.chatItem
+    Log.e(TAG, "apiUpdateChatItem bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiDeleteChatItem(type: ChatType, id: Long, itemId: Long, mode: CIDeleteMode): AChatItem? {
+    val r = sendCmd(CC.ApiDeleteChatItem(type, id, itemId, mode))
+    if (r is CR.ChatItemDeleted) return r.toChatItem
+    Log.e(TAG, "apiDeleteChatItem bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
  suspend fun getUserSMPServers(): List<String>? {
    val r = sendCmd(CC.GetUserSMPServers())
    if (r is CR.UserSMPServers) return r.smpServers
@@ -144,7 +176,7 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
        Log.e(TAG, "setUserSMPServers bad response: ${r.responseType} ${r.details}")
        AlertManager.shared.showAlertMsg(
          "Error saving SMP servers",
-          "Make sure SMP server addresses are in correct format, line separated and are not duplicated"
+          "Make sure SMP server addresses are in correct format, line separated and are not duplicated."
        )
        false
      }
@@ -164,7 +196,7 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
      r is CR.SentConfirmation || r is CR.SentInvitation -> return true
      r is CR.ContactAlreadyExists -> {
        AlertManager.shared.showAlertMsg("Contact already exists",
-          "You are already connected to ${r.contact.displayName} via this link"
+          "You are already connected to ${r.contact.displayName} via this link."
        )
        return false
      }
@@ -191,7 +223,7 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
        if (e is ChatError.ChatErrorChat && e.errorType is ChatErrorType.ContactGroups) {
          AlertManager.shared.showAlertMsg(
            "Can't delete contact!",
-            "Contact ${e.errorType.contact.displayName} cannot be deleted, it is a member of the group(s) ${e.errorType.groupNames}"
+            "Contact ${e.errorType.contact.displayName} cannot be deleted, it is a member of the group(s) ${e.errorType.groupNames}."
          )
        }
      }
@@ -201,7 +233,7 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
  }

  suspend fun apiUpdateProfile(profile: Profile): Profile? {
-    val r = sendCmd(CC.UpdateProfile(profile))
+    val r = sendCmd(CC.ApiUpdateProfile(profile))
    if (r is CR.UserProfileNoChange) return profile
    if (r is CR.UserProfileUpdated) return r.toProfile
    Log.e(TAG, "apiUpdateProfile bad response: ${r.responseType} ${r.details}")
@@ -301,12 +333,34 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
          ntfManager.notifyMessageReceived(cInfo, cItem)
        }
      }
-//        case let .chatItemUpdated(aChatItem):
-  //        let cInfo = aChatItem.chatInfo
-  //            let cItem = aChatItem.chatItem
-  //            if chatModel.upsertChatItem(cInfo, cItem) {
-  //              NtfManager.shared.notifyMessageReceived(cInfo, cItem)
-  //            }
+      is CR.ChatItemStatusUpdated -> {
+        val cInfo = r.chatItem.chatInfo
+        val cItem = r.chatItem.chatItem
+        var res = false
+        if (!cItem.isDeletedContent) {
+          res = chatModel.upsertChatItem(cInfo, cItem)
+        }
+        if (res) {
+          ntfManager.notifyMessageReceived(cInfo, cItem)
+        }
+      }
+      is CR.ChatItemUpdated -> {
+        val cInfo = r.chatItem.chatInfo
+        val cItem = r.chatItem.chatItem
+        if (chatModel.upsertChatItem(cInfo, cItem)) {
+          ntfManager.notifyMessageReceived(cInfo, cItem)
+        }
+      }
+      is CR.ChatItemDeleted -> {
+        val cInfo = r.toChatItem.chatInfo
+        val cItem = r.toChatItem.chatItem
+        if (cItem.meta.itemDeleted) {
+          chatModel.removeChatItem(cInfo, cItem)
+        } else {
+          // currently only broadcast deletion of rcv message can be received, and only this case should happen
+          chatModel.upsertChatItem(cInfo, cItem)
+        }
+      }
      else ->
        Log.d(TAG , "unsupported event: ${r.responseType}")
    }
@@ -332,6 +386,79 @@ open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val ap
      else e.string
    chatModel.updateNetworkStatus(contact, Chat.NetworkStatus.Error(err))
  }
+
+  fun showBackgroundServiceNotice() {
+    if (!getBackgroundServiceNoticeShown()) {
+      AlertManager.shared.showAlert {
+        AlertDialog(
+          onDismissRequest = AlertManager.shared::hideAlert,
+          title = {
+            Row {
+              Icon(
+                Icons.Outlined.Bolt,
+                contentDescription = "Instant notifications",
+              )
+              Text("Private instant notifications!", fontWeight = FontWeight.Bold)
+            }
+          },
+          text = {
+            Column {
+              Text(
+                buildAnnotatedString {
+                  append("To preserve your privacy instead of push notifications the app has a ")
+                  withStyle(SpanStyle(fontWeight = FontWeight.Medium)) {
+                    append("SimpleX background service")
+                  }
+                  append(" – it uses only a few percents of battery a day.")
+                },
+                Modifier.padding(bottom = 8.dp)
+              )
+              Text(
+                buildAnnotatedString {
+                  withStyle(SpanStyle(fontWeight = FontWeight.Medium)) {
+                    append("It can be disabled via settings")
+                  }
+                  append(" – notification would still be shown while the app is running.")
+                }
+              )
+            }
+          },
+          confirmButton = {
+            Button(onClick = AlertManager.shared::hideAlert) { Text("Ok") }
+          }
+        )
+      }
+      setBackgroundServiceNoticeShown()
+    }
+  }
+
+  fun getAutoRestartWorkerVersion(): Int = sharedPreferences.getInt(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, 0)
+
+  fun setAutoRestartWorkerVersion(version: Int) =
+    sharedPreferences.edit()
+      .putInt(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, version)
+      .apply()
+
+  fun getRunServiceInBackground(): Boolean = sharedPreferences.getBoolean(SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND, true)
+
+  fun setRunServiceInBackground(runService: Boolean) =
+    sharedPreferences.edit()
+      .putBoolean(SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND, runService)
+      .apply()
+
+  fun getBackgroundServiceNoticeShown(): Boolean = sharedPreferences.getBoolean(SHARED_PREFS_SERVICE_NOTICE_SHOWN, false)
+
+  fun setBackgroundServiceNoticeShown() =
+    sharedPreferences.edit()
+      .putBoolean(SHARED_PREFS_SERVICE_NOTICE_SHOWN, true)
+      .apply()
+
+  companion object {
+    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
+    private const val SHARED_PREFS_AUTO_RESTART_WORKER_VERSION = "AutoRestartWorkerVersion"
+    private const val SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND = "RunServiceInBackground"
+    private const val SHARED_PREFS_SERVICE_NOTICE_SHOWN = "BackgroundServiceNoticeShown"
+  }
 }

 // ChatCommand
@@ -343,12 +470,15 @@ sealed class CC {
  class ApiGetChats: CC()
  class ApiGetChat(val type: ChatType, val id: Long): CC()
  class ApiSendMessage(val type: ChatType, val id: Long, val mc: MsgContent): CC()
+  class ApiSendMessageQuote(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent): CC()
+  class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent): CC()
+  class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
  class GetUserSMPServers(): CC()
  class SetUserSMPServers(val smpServers: List<String>): CC()
  class AddContact: CC()
  class Connect(val connReq: String): CC()
  class ApiDeleteChat(val type: ChatType, val id: Long): CC()
-  class UpdateProfile(val profile: Profile): CC()
+  class ApiUpdateProfile(val profile: Profile): CC()
  class CreateMyAddress: CC()
  class DeleteMyAddress: CC()
  class ShowMyAddress: CC()
@@ -364,12 +494,15 @@ sealed class CC {
    is ApiGetChats -> "/_get chats"
    is ApiGetChat -> "/_get chat ${chatRef(type, id)} count=100"
    is ApiSendMessage -> "/_send ${chatRef(type, id)} ${mc.cmdString}"
+    is ApiSendMessageQuote -> "/_send_quote ${chatRef(type, id)} $itemId ${mc.cmdString}"
+    is ApiUpdateChatItem -> "/_update item ${chatRef(type, id)} $itemId ${mc.cmdString}"
+    is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
    is GetUserSMPServers -> "/smp_servers"
    is SetUserSMPServers -> "/smp_servers ${smpServersStr(smpServers)}"
    is AddContact -> "/connect"
    is Connect -> "/connect $connReq"
    is ApiDeleteChat -> "/_delete ${chatRef(type, id)}"
-    is UpdateProfile -> "/profile ${profile.displayName} ${profile.fullName}"
+    is ApiUpdateProfile -> "/_profile ${json.encodeToString(profile)}"
    is CreateMyAddress -> "/address"
    is DeleteMyAddress -> "/delete_address"
    is ShowMyAddress -> "/show_address"
@@ -386,12 +519,15 @@ sealed class CC {
    is ApiGetChats -> "apiGetChats"
    is ApiGetChat -> "apiGetChat"
    is ApiSendMessage -> "apiSendMessage"
+    is ApiSendMessageQuote -> "apiSendMessageQuote"
+    is ApiUpdateChatItem -> "apiUpdateChatItem"
+    is ApiDeleteChatItem -> "apiDeleteChatItem"
    is GetUserSMPServers -> "getUserSMPServers"
    is SetUserSMPServers -> "setUserSMPServers"
    is AddContact -> "addContact"
    is Connect -> "connect"
    is ApiDeleteChat -> "apiDeleteChat"
-    is UpdateProfile -> "updateProfile"
+    is ApiUpdateProfile -> "updateProfile"
    is CreateMyAddress -> "createMyAddress"
    is DeleteMyAddress -> "deleteMyAddress"
    is ShowMyAddress -> "showMyAddress"
@@ -422,6 +558,7 @@ class APIResponse(val resp: CR, val corr: String? = null) {
        json.decodeFromString(str)
      } catch(e: Exception) {
        try {
+          Log.d(TAG, e.localizedMessage)
          val data = json.parseToJsonElement(str).jsonObject
          APIResponse(
            resp = CR.Response(data["resp"]!!.jsonObject["type"]?.toString() ?: "invalid", json.encodeToString(data)),
@@ -468,7 +605,9 @@ sealed class CR {
  @Serializable @SerialName("groupEmpty") class GroupEmpty(val group: GroupInfo): CR()
  @Serializable @SerialName("userContactLinkSubscribed") class UserContactLinkSubscribed: CR()
  @Serializable @SerialName("newChatItem") class NewChatItem(val chatItem: AChatItem): CR()
+  @Serializable @SerialName("chatItemStatusUpdated") class ChatItemStatusUpdated(val chatItem: AChatItem): CR()
  @Serializable @SerialName("chatItemUpdated") class ChatItemUpdated(val chatItem: AChatItem): CR()
+  @Serializable @SerialName("chatItemDeleted") class ChatItemDeleted(val deletedChatItem: AChatItem, val toChatItem: AChatItem): CR()
  @Serializable @SerialName("cmdOk") class CmdOk: CR()
  @Serializable @SerialName("chatCmdError") class ChatCmdError(val chatError: ChatError): CR()
  @Serializable @SerialName("chatError") class ChatRespError(val chatError: ChatError): CR()
@@ -506,7 +645,9 @@ sealed class CR {
    is GroupEmpty -> "groupEmpty"
    is UserContactLinkSubscribed -> "userContactLinkSubscribed"
    is NewChatItem -> "newChatItem"
+    is ChatItemStatusUpdated -> "chatItemStatusUpdated"
    is ChatItemUpdated -> "chatItemUpdated"
+    is ChatItemDeleted -> "chatItemDeleted"
    is CmdOk -> "cmdOk"
    is ChatCmdError -> "chatCmdError"
    is ChatRespError -> "chatError"
@@ -545,7 +686,9 @@ sealed class CR {
    is GroupEmpty -> json.encodeToString(group)
    is UserContactLinkSubscribed -> noDetails()
    is NewChatItem -> json.encodeToString(chatItem)
+    is ChatItemStatusUpdated -> json.encodeToString(chatItem)
    is ChatItemUpdated -> json.encodeToString(chatItem)
+    is ChatItemDeleted -> "deletedChatItem:\n${json.encodeToString(deletedChatItem)}\ntoChatItem:\n${json.encodeToString(toChatItem)}"
    is CmdOk -> noDetails()
    is ChatCmdError -> chatError.string
    is ChatRespError -> chatError.string
@@ -13,3 +13,5 @@ val SecretColor = Color(0x40808080)
 val LightGray = Color(241, 242, 246, 255)
 val DarkGray = Color(43, 44, 46, 255)
 val HighOrLowlight = Color(134, 135, 139, 255)
+val ToolbarLight = Color(220, 220, 220, 20)
+val ToolbarDark = Color(80, 80, 80, 20)
@@ -2,45 +2,54 @@ package chat.simplex.app.ui.theme

 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.*
 import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+
+// https://github.com/rsms/inter
+val Inter = FontFamily(
+  Font(R.font.inter_regular),
+  Font(R.font.inter_italic, style = FontStyle.Italic),
+  Font(R.font.inter_bold, weight = FontWeight.Bold),
+  Font(R.font.inter_semi_bold, weight = FontWeight.SemiBold),
+  Font(R.font.inter_medium, weight = FontWeight.Medium),
+)

 // Set of Material typography styles to start with
 val Typography = Typography(
  h1 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
+    fontFamily = Inter,
+    fontWeight = FontWeight.Bold,
    fontSize = 32.sp,
  ),
  h2 = TextStyle(
-    fontFamily = FontFamily.Default,
+    fontFamily = Inter,
    fontWeight = FontWeight.Normal,
    fontSize = 24.sp
  ),
  h3 = TextStyle(
-    fontFamily = FontFamily.Default,
+    fontFamily = Inter,
    fontWeight = FontWeight.Normal,
    fontSize = 19.sp
  ),
  body1 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 17.sp
-  ),
-  body2 = TextStyle(
-    fontFamily = FontFamily.Default,
+    fontFamily = Inter,
    fontWeight = FontWeight.Normal,
    fontSize = 16.sp
  ),
+  body2 = TextStyle(
+    fontFamily = Inter,
+    fontWeight = FontWeight.Normal,
+    fontSize = 14.sp
+  ),
  button = TextStyle(
-    fontFamily = FontFamily.Default,
+    fontFamily = Inter,
    fontWeight = FontWeight.Normal,
    fontSize = 16.sp,
  ),
  caption = TextStyle(
-    fontFamily = FontFamily.Default,
+    fontFamily = Inter,
    fontWeight = FontWeight.Normal,
-    fontSize = 20.sp
+    fontSize = 18.sp
  )
-)
+)
@@ -8,8 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
@@ -40,11 +39,11 @@ fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
 }

@Composable
-fun TerminalLayout(terminalItems: List<TerminalItem> , close: () -> Unit, sendCommand: (String) -> Unit) {
+fun TerminalLayout(terminalItems: List<TerminalItem>, close: () -> Unit, sendCommand: (String) -> Unit) {
  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
    Scaffold(
      topBar = { CloseSheetBar(close) },
-      bottomBar = { SendMsgView(sendCommand) },
+      bottomBar = { SendMsgView(msg = remember { mutableStateOf("") }, sendCommand) },
      modifier = Modifier.navigationBarsWithImePadding()
    ) { contentPadding ->
      Surface(
@@ -14,6 +14,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
+import chat.simplex.app.SimplexService
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
 import chat.simplex.app.views.helpers.withApi
@@ -148,9 +149,11 @@ fun CreateProfilePanel(chatModel: ChatModel) {
    Button(onClick = {
      withApi {
        val user = chatModel.controller.apiCreateActiveUser(
-          Profile(displayName, fullName)
+          Profile(displayName, fullName, null)
        )
        chatModel.controller.startChat(user)
+        SimplexService.start(chatModel.controller.appContext)
+        chatModel.controller.showBackgroundServiceNotice()
      }
    },
    enabled = (displayName.isNotEmpty() && isValidDisplayName(displayName))
@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -61,7 +62,7 @@ fun ChatInfoLayout(chat: Chat, close: () -> Unit, deleteContact: () -> Unit) {
    ChatInfoImage(chat, size = 192.dp)
    val cInfo = chat.chatInfo
    Text(
-      cInfo.displayName, style = MaterialTheme.typography.h1,
+      cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
      color = MaterialTheme.colors.onBackground,
      modifier = Modifier.padding(top = 32.dp).padding(bottom = 8.dp)
    )
@@ -3,18 +3,20 @@ package chat.simplex.app.views.chat
 import android.content.res.Configuration
 import android.util.Log
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBack
+import androidx.compose.material.icons.outlined.ArrowBackIos
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -22,8 +24,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.TAG
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.item.ChatItemView
+import chat.simplex.app.views.chatlist.openChat
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.ModalManager
 import com.google.accompanist.insets.ProvideWindowInsets
@@ -35,9 +38,13 @@ import kotlinx.datetime.Clock
@Composable
 fun ChatView(chatModel: ChatModel) {
  val chat: Chat? = chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }
-  if (chat == null) {
+  val user = chatModel.currentUser.value
+  if (chat == null || user == null) {
    chatModel.chatId.value = null
  } else {
+    val quotedItem = remember { mutableStateOf<ChatItem?>(null) }
+    val editingItem = remember { mutableStateOf<ChatItem?>(null) }
+    var msg = remember { mutableStateOf("") }
    BackHandler { chatModel.chatId.value = null }
    // TODO a more advanced version would mark as read only if in view
    LaunchedEffect(chat.chatItems) {
@@ -54,20 +61,53 @@ fun ChatView(chatModel: ChatModel) {
        }
      }
    }
-    ChatLayout(chat, chatModel.chatItems,
+    ChatLayout(user, chat, chatModel.chatItems, msg, quotedItem, editingItem,
      back = { chatModel.chatId.value = null },
      info = { ModalManager.shared.showCustomModal { close -> ChatInfoView(chatModel, close) } },
+      openDirectChat = { contactId ->
+        val c = chatModel.chats.firstOrNull {
+          it.chatInfo is ChatInfo.Direct && it.chatInfo.contact.contactId == contactId
+        }
+        if (c != null) withApi { openChat(chatModel, c.chatInfo) }
+      },
      sendMessage = { msg ->
        withApi {
          // show "in progress"
          val cInfo = chat.chatInfo
-          val newItem = chatModel.controller.apiSendMessage(
+          val ei = editingItem.value
+          if (ei != null) {
+            val updatedItem = chatModel.controller.apiUpdateChatItem(
+              type = cInfo.chatType,
+              id = cInfo.apiId,
+              itemId = ei.meta.itemId,
+              mc = MsgContent.MCText(msg)
+            )
+            if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
+          } else {
+            val newItem = chatModel.controller.apiSendMessage(
+              type = cInfo.chatType,
+              id = cInfo.apiId,
+              quotedItemId = quotedItem.value?.meta?.itemId,
+              mc = MsgContent.MCText(msg)
+            )
+            if (newItem != null) chatModel.addChatItem(cInfo, newItem.chatItem)
+          }
+          // hide "in progress"
+          editingItem.value = null
+          quotedItem.value = null
+        }
+      },
+      resetMessage = { msg.value = "" },
+      deleteMessage = { itemId, mode ->
+        withApi {
+          val cInfo = chat.chatInfo
+          val toItem = chatModel.controller.apiDeleteChatItem(
            type = cInfo.chatType,
            id = cInfo.apiId,
-            mc = MsgContent.MCText(msg)
+            itemId = itemId,
+            mode = mode
          )
-          // hide "in progress"
-          if (newItem != null) chatModel.addChatItem(cInfo, newItem.chatItem)
+          if (toItem != null) chatModel.removeChatItem(cInfo, toItem.chatItem)
        }
      }
    )
@@ -76,23 +116,32 @@ fun ChatView(chatModel: ChatModel) {

@Composable
 fun ChatLayout(
-  chat: Chat, chatItems: List<ChatItem>,
+  user: User,
+  chat: Chat,
+  chatItems: List<ChatItem>,
+  msg: MutableState<String>,
+  quotedItem: MutableState<ChatItem?>,
+  editingItem: MutableState<ChatItem?>,
  back: () -> Unit,
  info: () -> Unit,
-  sendMessage: (String) -> Unit
+  openDirectChat: (Long) -> Unit,
+  sendMessage: (String) -> Unit,
+  resetMessage: () -> Unit,
+  deleteMessage: (Long, CIDeleteMode) -> Unit
 ) {
  Surface(
    Modifier
      .fillMaxWidth()
-      .background(MaterialTheme.colors.background)) {
+      .background(MaterialTheme.colors.background)
+  ) {
    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
      Scaffold(
        topBar = { ChatInfoToolbar(chat, back, info) },
-        bottomBar = { SendMsgView(sendMessage) },
+        bottomBar = { ComposeView(msg, quotedItem, editingItem, sendMessage, resetMessage) },
        modifier = Modifier.navigationBarsWithImePadding()
      ) { contentPadding ->
        Box(Modifier.padding(contentPadding)) {
-          ChatItemsList(chatItems)
+          ChatItemsList(user, chat, chatItems, msg, quotedItem, editingItem, openDirectChat, deleteMessage)
        }
      }
    }
@@ -101,41 +150,51 @@ fun ChatLayout(

@Composable
 fun ChatInfoToolbar(chat: Chat, back: () -> Unit, info: () -> Unit) {
-  Box(
-    Modifier
-      .height(60.dp)
-      .padding(horizontal = 8.dp),
-    contentAlignment = Alignment.CenterStart
-  ) {
-    IconButton(onClick = back) {
-      Icon(
-        Icons.Outlined.ArrowBack,
-        "Back",
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-    Row(
+  Column {
+    Box(
      Modifier
-        .padding(horizontal = 68.dp)
        .fillMaxWidth()
-        .clickable(onClick = info),
-      horizontalArrangement = Arrangement.Center,
-      verticalAlignment = Alignment.CenterVertically
+        .height(52.dp)
+        .background(if (isSystemInDarkTheme()) ToolbarDark else ToolbarLight)
+        .padding(horizontal = 8.dp),
+      contentAlignment = Alignment.CenterStart,
    ) {
-      val cInfo = chat.chatInfo
-      ChatInfoImage(chat, size = 40.dp)
-      Column(Modifier.padding(start = 8.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+      IconButton(onClick = back) {
+        Icon(
+          Icons.Outlined.ArrowBackIos,
+          "Back",
+          tint = MaterialTheme.colors.primary,
+          modifier = Modifier.padding(10.dp)
+        )
+      }
+      Row(
+        Modifier
+          .padding(horizontal = 68.dp)
+          .fillMaxWidth()
+          .clickable(onClick = info),
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically
      ) {
-        Text(cInfo.displayName, fontWeight = FontWeight.Bold,
-          maxLines = 1, overflow = TextOverflow.Ellipsis)
-        if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
-          Text(cInfo.fullName,
-            maxLines = 1, overflow = TextOverflow.Ellipsis)
+        val cInfo = chat.chatInfo
+        ChatInfoImage(chat, size = 40.dp)
+        Column(
+          Modifier.padding(start = 8.dp),
+          horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+          Text(
+            cInfo.displayName, fontWeight = FontWeight.SemiBold,
+            maxLines = 1, overflow = TextOverflow.Ellipsis
+          )
+          if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
+            Text(
+              cInfo.fullName,
+              maxLines = 1, overflow = TextOverflow.Ellipsis
+            )
+          }
        }
      }
    }
+    Divider()
  }
 }

@@ -152,7 +211,16 @@ val CIListStateSaver = run {
 }

@Composable
-fun ChatItemsList(chatItems: List<ChatItem>) {
+fun ChatItemsList(
+  user: User,
+  chat: Chat,
+  chatItems: List<ChatItem>,
+  msg: MutableState<String>,
+  quotedItem: MutableState<ChatItem?>,
+  editingItem: MutableState<ChatItem?>,
+  openDirectChat: (Long) -> Unit,
+  deleteMessage: (Long, CIDeleteMode) -> Unit
+) {
  val listState = rememberLazyListState()
  val keyboardState by getKeyboardState()
  val ciListState = rememberSaveable(stateSaver = CIListStateSaver) {
@@ -160,12 +228,56 @@ fun ChatItemsList(chatItems: List<ChatItem>) {
  }
  val scope = rememberCoroutineScope()
  val uriHandler = LocalUriHandler.current
+  val cxt = LocalContext.current
  LazyColumn(state = listState) {
-    items(chatItems) { cItem ->
-      ChatItemView(cItem, uriHandler)
+    itemsIndexed(chatItems) { i, cItem ->
+      if (i == 0) {
+        Spacer(Modifier.size(8.dp))
+      }
+      if (chat.chatInfo is ChatInfo.Group) {
+        if (cItem.chatDir is CIDirection.GroupRcv) {
+          val prevItem = if (i > 0) chatItems[i - 1] else null
+          val member = cItem.chatDir.groupMember
+          val showMember = showMemberImage(member, prevItem)
+          Row(Modifier.padding(start = 8.dp, end = 66.dp)) {
+            if (showMember) {
+              val contactId = member.memberContactId
+              if (contactId == null) {
+                MemberImage(member)
+              } else {
+                Box(
+                  Modifier
+                    .clip(CircleShape)
+                    .clickable { openDirectChat(contactId) }
+                ) {
+                  MemberImage(member)
+                }
+              }
+              Spacer(Modifier.size(4.dp))
+            } else {
+              Spacer(Modifier.size(42.dp))
+            }
+            ChatItemView(user, cItem, msg, quotedItem, editingItem, cxt, uriHandler, showMember = showMember, deleteMessage = deleteMessage)
+          }
+        } else {
+          Box(Modifier.padding(start = 86.dp, end = 12.dp)) {
+            ChatItemView(user, cItem, msg, quotedItem, editingItem, cxt, uriHandler, deleteMessage = deleteMessage)
+          }
+        }
+      } else { // direct message
+        val sent = cItem.chatDir.sent
+        Box(
+          Modifier.padding(
+            start = if (sent) 76.dp else 12.dp,
+            end = if (sent) 12.dp else 76.dp,
+          )
+        ) {
+          ChatItemView(user, cItem, msg, quotedItem, editingItem, cxt, uriHandler, deleteMessage = deleteMessage)
+        }
+      }
    }
    val len = chatItems.count()
-    if (keyboardState != ciListState.value.keyboardState || !ciListState.value.scrolled || len != ciListState.value.itemCount) {
+    if (len > 1 && (keyboardState != ciListState.value.keyboardState || !ciListState.value.scrolled || len != ciListState.value.itemCount)) {
      scope.launch {
        ciListState.value = CIListState(true, len, keyboardState)
        listState.animateScrollToItem(len - 1)
@@ -174,6 +286,16 @@ fun ChatItemsList(chatItems: List<ChatItem>) {
  }
 }

+fun showMemberImage(member: GroupMember, prevItem: ChatItem?): Boolean {
+  return prevItem == null || prevItem.chatDir is CIDirection.GroupSnd ||
+      (prevItem.chatDir is CIDirection.GroupRcv && prevItem.chatDir.groupMember.groupMemberId != member.groupMemberId)
+}
+
+@Composable
+fun MemberImage(member: GroupMember) {
+  ProfileImage(38.dp, member.memberProfile.image)
+}
+
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -190,26 +312,77 @@ fun PreviewChatLayout() {
      ChatItem.getSampleData(
        2, CIDirection.DirectRcv(), Clock.System.now(), "hello"
      ),
-      ChatItem.getSampleData(
-        3, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
+      ChatItem.getDeletedContentSampleData(3),
      ChatItem.getSampleData(
        4, CIDirection.DirectSnd(), Clock.System.now(), "hello"
      ),
      ChatItem.getSampleData(
-        5, CIDirection.DirectRcv(), Clock.System.now(), "hello"
+        5, CIDirection.DirectSnd(), Clock.System.now(), "hello"
+      ),
+      ChatItem.getSampleData(
+        6, CIDirection.DirectRcv(), Clock.System.now(), "hello"
      )
    )
    ChatLayout(
+      user = User.sampleData,
      chat = Chat(
        chatInfo = ChatInfo.Direct.sampleData,
        chatItems = chatItems,
        chatStats = Chat.ChatStats()
      ),
      chatItems = chatItems,
+      msg = remember { mutableStateOf("") },
+      quotedItem = remember { mutableStateOf(null) },
+      editingItem = remember { mutableStateOf(null) },
      back = {},
      info = {},
-      sendMessage = {}
+      openDirectChat = {},
+      sendMessage = {},
+      resetMessage = {},
+      deleteMessage = { _, _ -> }
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewGroupChatLayout() {
+  SimpleXTheme {
+    val chatItems = listOf(
+      ChatItem.getSampleData(
+        1, CIDirection.GroupSnd(), Clock.System.now(), "hello"
+      ),
+      ChatItem.getSampleData(
+        2, CIDirection.GroupRcv(GroupMember.sampleData), Clock.System.now(), "hello"
+      ),
+      ChatItem.getDeletedContentSampleData(3),
+      ChatItem.getSampleData(
+        4, CIDirection.GroupRcv(GroupMember.sampleData), Clock.System.now(), "hello"
+      ),
+      ChatItem.getSampleData(
+        5, CIDirection.GroupSnd(), Clock.System.now(), "hello"
+      ),
+      ChatItem.getSampleData(
+        6, CIDirection.GroupRcv(GroupMember.sampleData), Clock.System.now(), "hello"
+      )
+    )
+    ChatLayout(
+      user = User.sampleData,
+      chat = Chat(
+        chatInfo = ChatInfo.Group.sampleData,
+        chatItems = chatItems,
+        chatStats = Chat.ChatStats()
+      ),
+      chatItems = chatItems,
+      msg = remember { mutableStateOf("") },
+      quotedItem = remember { mutableStateOf(null) },
+      editingItem = remember { mutableStateOf(null) },
+      back = {},
+      info = {},
+      openDirectChat = {},
+      sendMessage = {},
+      resetMessage = {},
+      deleteMessage = { _, _ -> }
    )
  }
 }
@@ -0,0 +1,30 @@
+package chat.simplex.app.views.chat
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import chat.simplex.app.model.ChatItem
+
+// TODO ComposeState
+
+@Composable
+fun ComposeView(
+  msg: MutableState<String>,
+  quotedItem: MutableState<ChatItem?>,
+  editingItem: MutableState<ChatItem?>,
+  sendMessage: (String) -> Unit,
+  resetMessage: () -> Unit
+) {
+  Column {
+    when {
+      quotedItem.value != null -> {
+        ContextItemView(quotedItem)
+      }
+      editingItem.value != null -> {
+        ContextItemView(editingItem, editing = editingItem.value != null, resetMessage)
+      }
+      else -> {}
+    }
+    SendMsgView(msg, sendMessage, editing = editingItem.value != null)
+  }
+}
@@ -0,0 +1,90 @@
+package chat.simplex.app.views.chat
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.model.CIDirection
+import chat.simplex.app.model.ChatItem
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.chat.item.*
+import kotlinx.datetime.Clock
+
+@Composable
+fun ContextItemView(
+  contextItem: MutableState<ChatItem?>,
+  editing: Boolean = false,
+  resetMessage: () -> Unit = {}
+) {
+  val cxtItem = contextItem.value
+  if (cxtItem != null) {
+    val sent = cxtItem.chatDir.sent
+    Row(
+      Modifier
+        .padding(top = 8.dp)
+        .background(if (sent) SentColorLight else ReceivedColorLight),
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      Box(
+        Modifier
+          .padding(start = 16.dp)
+          .padding(vertical = 12.dp)
+          .fillMaxWidth()
+          .weight(1F)
+      ) {
+        ContextItemText(cxtItem)
+      }
+      IconButton(onClick = {
+        contextItem.value = null
+        if (editing) {
+          resetMessage()
+        }
+      }) {
+        Icon(
+          Icons.Outlined.Close,
+          contentDescription = "Cancel",
+          tint = MaterialTheme.colors.primary,
+          modifier = Modifier.padding(10.dp)
+        )
+      }
+    }
+  }
+}
+
+@Composable
+private fun ContextItemText(cxtItem: ChatItem) {
+  val member = cxtItem.memberDisplayName
+  if (member == null) {
+    Text(cxtItem.content.text, maxLines = 3)
+  } else {
+    val annotatedText = buildAnnotatedString {
+      withStyle(boldFont) { append(member) }
+      append(": ${cxtItem.content.text}")
+    }
+    Text(annotatedText, maxLines = 3)
+  }
+}
+
+@Preview
+@Composable
+fun PreviewContextItemView() {
+  SimpleXTheme {
+    ContextItemView(
+      contextItem = remember {
+        mutableStateOf(
+          ChatItem.getSampleData(
+            1, CIDirection.DirectRcv(), Clock.System.now(), "hello"
+          )
+        )
+      }
+    )
+  }
+}
@@ -9,6 +9,7 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.outlined.ArrowUpward
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -21,14 +22,23 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.chat.item.*

@Composable
-fun SendMsgView(sendMessage: (String) -> Unit) {
-  var cmd by remember { mutableStateOf("") }
+fun SendMsgView(msg: MutableState<String>, sendMessage: (String) -> Unit, editing: Boolean = false) {
+  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
+  var textStyle by remember { mutableStateOf(smallFont) }
  BasicTextField(
-    value = cmd,
-    onValueChange = { cmd = it },
-    textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
+    value = msg.value,
+    onValueChange = {
+      msg.value = it
+      textStyle = if (isShortEmoji(it)) {
+        if (it.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont
+      } else {
+        smallFont
+      }
+    },
+    textStyle = textStyle,
    maxLines = 16,
    keyboardOptions = KeyboardOptions.Default.copy(
      capitalization = KeyboardCapitalization.Sentences,
@@ -54,9 +64,9 @@ fun SendMsgView(sendMessage: (String) -> Unit) {
          ) {
            innerTextField()
          }
-          val color = if (cmd.isNotEmpty()) MaterialTheme.colors.primary else Color.Gray
+          val color = if (msg.value.isNotEmpty()) MaterialTheme.colors.primary else Color.Gray
          Icon(
-            Icons.Outlined.ArrowUpward,
+            if (editing) Icons.Filled.Check else Icons.Outlined.ArrowUpward,
            "Send Message",
            tint = Color.White,
            modifier = Modifier
@@ -65,9 +75,10 @@ fun SendMsgView(sendMessage: (String) -> Unit) {
              .clip(CircleShape)
              .background(color)
              .clickable {
-                if (cmd.isNotEmpty()) {
-                  sendMessage(cmd)
-                  cmd = ""
+                if (msg.value.isNotEmpty()) {
+                  sendMessage(msg.value)
+                  msg.value = ""
+                  textStyle = smallFont
                }
              }
          )
@@ -87,7 +98,25 @@ fun SendMsgView(sendMessage: (String) -> Unit) {
 fun PreviewSendMsgView() {
  SimpleXTheme {
    SendMsgView(
+      msg = remember { mutableStateOf("") },
      sendMessage = { msg -> println(msg) }
    )
  }
 }
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewSendMsgViewEditing() {
+  SimpleXTheme {
+    SendMsgView(
+      msg = remember { mutableStateOf("") },
+      sendMessage = { msg -> println(msg) },
+      editing = true
+    )
+  }
+}
@@ -1,8 +1,15 @@
 package chat.simplex.app.views.chat.item

+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Edit
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.CIDirection
 import chat.simplex.app.model.ChatItem
@@ -11,11 +18,27 @@ import kotlinx.datetime.Clock

@Composable
 fun CIMetaView(chatItem: ChatItem) {
-  Text(
-    chatItem.timestampText,
-    color = HighOrLowlight,
-    fontSize = 14.sp
-  )
+  Row(
+    horizontalArrangement = Arrangement.spacedBy(4.dp),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    if (!chatItem.isDeletedContent) {
+      if (chatItem.meta.itemEdited) {
+        Icon(
+          Icons.Filled.Edit,
+          modifier = Modifier.height(12.dp),
+          contentDescription = "Edited",
+          tint = HighOrLowlight,
+        )
+      }
+      // TODO status
+    }
+    Text(
+      chatItem.timestampText,
+      color = HighOrLowlight,
+      fontSize = 14.sp
+    )
+  }
 }

@Preview
@@ -27,3 +50,22 @@ fun PreviewCIMetaView() {
    )
  )
 }
+
+@Preview
+@Composable
+fun PreviewCIMetaViewEdited() {
+  CIMetaView(
+    chatItem = ChatItem.getSampleData(
+      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
+      itemEdited = true
+    )
+  )
+}
+
+@Preview
+@Composable
+fun PreviewCIMetaViewDeletedContent() {
+  CIMetaView(
+    chatItem = ChatItem.getDeletedContentSampleData()
+  )
+}
@@ -1,44 +1,169 @@
 package chat.simplex.app.views.chat.item

+import android.content.Context
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.CIDirection
-import chat.simplex.app.model.ChatItem
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.helpers.*
 import kotlinx.datetime.Clock

@Composable
-fun ChatItemView(chatItem: ChatItem, uriHandler: UriHandler? = null) {
-  val sent = chatItem.chatDir.sent
+fun ChatItemView(
+  user: User,
+  cItem: ChatItem,
+  msg: MutableState<String>,
+  quotedItem: MutableState<ChatItem?>,
+  editingItem: MutableState<ChatItem?>,
+  cxt: Context,
+  uriHandler: UriHandler? = null,
+  showMember: Boolean = false,
+  deleteMessage: (Long, CIDeleteMode) -> Unit
+) {
+  val sent = cItem.chatDir.sent
  val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
-
+  var showMenu by remember { mutableStateOf(false) }
  Box(
    modifier = Modifier
      .padding(bottom = 4.dp)
-      .fillMaxWidth()
-      .padding(
-        start = if (sent) 60.dp else 16.dp,
-        end = if (sent) 16.dp else 60.dp,
-      ),
+      .fillMaxWidth(),
    contentAlignment = alignment,
  ) {
-    TextItemView(chatItem, uriHandler)
+    Column(Modifier.combinedClickable(onLongClick = { showMenu = true }, onClick = {})) {
+      if (cItem.isMsgContent) {
+        if (cItem.quotedItem == null && isShortEmoji(cItem.content.text)) {
+          EmojiItemView(cItem)
+        } else {
+          FramedItemView(user, cItem, uriHandler, showMember = showMember)
+        }
+      } else if (cItem.isDeletedContent) {
+        DeletedItemView(cItem, showMember = showMember)
+      }
+      if (cItem.isMsgContent) {
+        DropdownMenu(expanded = showMenu, onDismissRequest = { showMenu = false }) {
+          ItemAction("Reply", Icons.Outlined.Reply, onClick = {
+            editingItem.value = null
+            quotedItem.value = cItem
+            showMenu = false
+          })
+          ItemAction("Share", Icons.Outlined.Share, onClick = {
+            shareText(cxt, cItem.content.text)
+            showMenu = false
+          })
+          ItemAction("Copy", Icons.Outlined.ContentCopy, onClick = {
+            copyText(cxt, cItem.content.text)
+            showMenu = false
+          })
+          if (cItem.chatDir.sent && cItem.meta.editable) {
+            ItemAction("Edit", Icons.Filled.Edit, onClick = {
+              quotedItem.value = null
+              editingItem.value = cItem
+              msg.value = cItem.content.text
+              showMenu = false
+            })
+          }
+          ItemAction(
+            "Delete",
+            Icons.Outlined.Delete,
+            onClick = {
+              showMenu = false
+              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
+            },
+            color = Color.Red
+          )
+        }
+      }
+    }
  }
 }

+@Composable
+private fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = MaterialTheme.colors.onBackground) {
+  DropdownMenuItem(onClick) {
+    Row {
+      Text(
+        text,
+        modifier = Modifier
+          .fillMaxWidth()
+          .weight(1F),
+        color = color
+      )
+      Icon(icon, text, tint = color)
+    }
+  }
+}
+
+fun deleteMessageAlertDialog(chatItem: ChatItem, deleteMessage: (Long, CIDeleteMode) -> Unit) {
+  AlertManager.shared.showAlertDialogButtons(
+    title = "Delete message?",
+    text = "Message will be deleted - this cannot be undone!",
+    buttons = {
+      Row(
+        Modifier
+          .fillMaxWidth()
+          .padding(horizontal = 8.dp, vertical = 2.dp),
+        horizontalArrangement = Arrangement.End,
+      ) {
+        Button(onClick = {
+          deleteMessage(chatItem.id, CIDeleteMode.cidmInternal)
+          AlertManager.shared.hideAlert()
+        }) { Text("For me only") }
+        if (chatItem.meta.editable) {
+          Spacer(Modifier.padding(horizontal = 4.dp))
+          Button(onClick = {
+            deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)
+            AlertManager.shared.hideAlert()
+          }) { Text("For everyone") }
+        }
+      }
+    }
+  )
+}
+
@Preview
@Composable
 fun PreviewChatItemView() {
  SimpleXTheme {
    ChatItemView(
-      chatItem = ChatItem.getSampleData(
+      User.sampleData,
+      ChatItem.getSampleData(
        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      )
+      ),
+      msg = remember { mutableStateOf("") },
+      quotedItem = remember { mutableStateOf(null) },
+      editingItem = remember { mutableStateOf(null) },
+      cxt = LocalContext.current,
+      deleteMessage = { _, _ -> }
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewChatItemViewDeletedContent() {
+  SimpleXTheme {
+    ChatItemView(
+      User.sampleData,
+      ChatItem.getDeletedContentSampleData(),
+      msg = remember { mutableStateOf("") },
+      quotedItem = remember { mutableStateOf(null) },
+      editingItem = remember { mutableStateOf(null) },
+      cxt = LocalContext.current,
+      deleteMessage = { _, _ -> }
    )
  }
 }
@@ -0,0 +1,56 @@
+package chat.simplex.app.views.chat.item
+
+import android.content.res.Configuration
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.tooling.preview.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
+
+@Composable
+fun DeletedItemView(ci: ChatItem, showMember: Boolean = false) {
+  Surface(
+    shape = RoundedCornerShape(18.dp),
+    color = ReceivedColorLight,
+  ) {
+    Row(
+      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
+      verticalAlignment = Alignment.Bottom
+    ) {
+      Text(
+        buildAnnotatedString {
+          appendSender(this, if (showMember) ci.memberDisplayName else null, true)
+          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(ci.content.text) }
+        },
+        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+        modifier = Modifier.padding(end = 8.dp)
+      )
+      CIMetaView(ci)
+    }
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewDeletedItemView() {
+  SimpleXTheme {
+    DeletedItemView(
+      ChatItem.getDeletedContentSampleData()
+    )
+  }
+}
@@ -0,0 +1,42 @@
+package chat.simplex.app.views.chat.item
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.model.ChatItem
+
+val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp)
+val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp)
+
+@Composable
+fun EmojiItemView(chatItem: ChatItem) {
+  Column(
+    Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    EmojiText(chatItem.content.text)
+    CIMetaView(chatItem)
+  }
+}
+
+@Composable
+fun EmojiText(text: String) {
+  val s = text.trim()
+  Text(s, style = if (s.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont)
+}
+
+private fun isSimpleEmoji(c: Int): Boolean = c > 0x238C
+
+fun isEmoji(c: Int): Boolean = isSimpleEmoji(c) // || isCombinedIntoEmoji(c)
+
+// TODO count perceived emojis, possibly using icu4j
+fun isShortEmoji(str: String): Boolean {
+  val s = str.trim()
+  return s.codePoints().count() in 1..5 && s.codePoints().allMatch(::isEmoji)
+}
@@ -0,0 +1,155 @@
+package chat.simplex.app.views.chat.item
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.UriHandler
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.SimpleXTheme
+import kotlinx.datetime.Clock
+
+val SentColorLight = Color(0x1E45B8FF)
+val ReceivedColorLight = Color(0x20B1B0B5)
+val SentQuoteColorLight = Color(0x2545B8FF)
+val ReceivedQuoteColorLight = Color(0x25B1B0B5)
+
+@Composable
+fun FramedItemView(user: User, ci: ChatItem, uriHandler: UriHandler? = null, showMember: Boolean = false) {
+  val sent = ci.chatDir.sent
+  Surface(
+    shape = RoundedCornerShape(18.dp),
+    color = if (sent) SentColorLight else ReceivedColorLight
+  ) {
+    Box(contentAlignment = Alignment.BottomEnd) {
+      Column(Modifier.width(IntrinsicSize.Max)) {
+        val qi = ci.quotedItem
+        if (qi != null) {
+          Box(
+            Modifier
+              .background(if (sent) SentQuoteColorLight else ReceivedQuoteColorLight)
+              .padding(vertical = 6.dp, horizontal = 12.dp)
+              .fillMaxWidth()
+          ) {
+            MarkdownText(
+              qi, sender = qi.sender(user), senderBold = true, maxLines = 3,
+              style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface)
+            )
+          }
+        }
+        Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
+          if (ci.formattedText == null && isShortEmoji(ci.content.text)) {
+            Column(
+              Modifier
+                .padding(bottom = 2.dp)
+                .fillMaxWidth(),
+              horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+              EmojiText(ci.content.text)
+              Text("")
+            }
+          } else {
+            MarkdownText(
+              ci.content, ci.formattedText, if (showMember) ci.memberDisplayName else null,
+              metaText = ci.timestampText, edited = ci.meta.itemEdited, uriHandler = uriHandler, senderBold = true
+            )
+          }
+        }
+      }
+      Box(Modifier.padding(bottom = 6.dp, end = 12.dp)) {
+        CIMetaView(ci)
+      }
+    }
+  }
+}
+
+class EditedProvider: PreviewParameterProvider<Boolean> {
+  override val values = listOf(false, true).asSequence()
+}
+
+@Preview
+@Composable
+fun PreviewTextItemViewSnd(@PreviewParameter(EditedProvider::class) edited: Boolean) {
+  SimpleXTheme {
+    FramedItemView(
+      User.sampleData,
+      ChatItem.getSampleData(
+        1, CIDirection.DirectSnd(), Clock.System.now(), "hello", itemEdited = edited
+      )
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewTextItemViewRcv(@PreviewParameter(EditedProvider::class) edited: Boolean) {
+  SimpleXTheme {
+    FramedItemView(
+      User.sampleData,
+      ChatItem.getSampleData(
+        1, CIDirection.DirectRcv(), Clock.System.now(), "hello", itemEdited = edited
+      )
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewTextItemViewLong(@PreviewParameter(EditedProvider::class) edited: Boolean) {
+  SimpleXTheme {
+    FramedItemView(
+      User.sampleData,
+      ChatItem.getSampleData(
+        1,
+        CIDirection.DirectSnd(),
+        Clock.System.now(),
+        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+        itemEdited = edited
+      )
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewTextItemViewQuote(@PreviewParameter(EditedProvider::class) edited: Boolean) {
+  SimpleXTheme {
+    FramedItemView(
+      User.sampleData,
+      ChatItem.getSampleData(
+        1, CIDirection.DirectSnd(),
+        Clock.System.now(),
+        "https://simplex.chat",
+        CIStatus.SndSent(),
+        quotedItem = CIQuote.getSample(1, Clock.System.now(), "hi", chatDir = CIDirection.DirectRcv()),
+        itemEdited = edited
+      )
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewTextItemViewEmoji(@PreviewParameter(EditedProvider::class) edited: Boolean) {
+  SimpleXTheme {
+    FramedItemView(
+      User.sampleData,
+      ChatItem.getSampleData(
+        1, CIDirection.DirectSnd(),
+        Clock.System.now(),
+        "👍",
+        CIStatus.SndSent(),
+        quotedItem = CIQuote.getSample(1, Clock.System.now(), "Lorem ipsum dolor sit amet", chatDir = CIDirection.DirectRcv()),
+        itemEdited = edited
+      )
+    )
+  }
+}
@@ -1,48 +1,17 @@
 package chat.simplex.app.views.chat.item

-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.ClickableText
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.CIDirection
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.SimpleXTheme
-import kotlinx.datetime.Clock
-
-// TODO move to theme
-val SentColorLight = Color(0x1E45B8FF)
-val ReceivedColorLight = Color(0x1EB1B0B5)
-
-@Composable
-fun TextItemView(chatItem: ChatItem, uriHandler: UriHandler? = null) {
-  val sent = chatItem.chatDir.sent
-  Surface(
-    shape = RoundedCornerShape(18.dp),
-    color = if (sent) SentColorLight else ReceivedColorLight
-  ) {
-    Box(
-      modifier = Modifier.padding(vertical = 6.dp, horizontal = 12.dp)
-    ) {
-      Box(contentAlignment = Alignment.BottomEnd) {
-        MarkdownText(chatItem, uriHandler = uriHandler, groupMemberBold = true)
-        CIMetaView(chatItem)
-      }
-    }
-  }
-}
+import chat.simplex.app.model.*

 val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
 val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
@@ -56,33 +25,46 @@ fun appendGroupMember(b: AnnotatedString.Builder, chatItem: ChatItem, groupMembe
  }
 }

+fun appendSender(b: AnnotatedString.Builder, sender: String?, senderBold: Boolean) {
+  if (sender != null) {
+    if (senderBold) b.withStyle(boldFont) { append(sender) }
+    else b.append(sender)
+    b.append(": ")
+  }
+}
+
@Composable
 fun MarkdownText (
-  chatItem: ChatItem,
+  content: ItemContent,
+  formattedText: List<FormattedText>? = null,
+  sender: String? = null,
+  metaText: String? = null,
+  edited: Boolean = false,
  style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
  maxLines: Int = Int.MAX_VALUE,
  overflow: TextOverflow = TextOverflow.Clip,
  uriHandler: UriHandler? = null,
-  groupMemberBold: Boolean = false,
+  senderBold: Boolean = false,
  modifier: Modifier = Modifier
 ) {
-  if (chatItem.formattedText == null) {
+  val reserve = if (edited) "      " else "   "
+  if (formattedText == null) {
    val annotatedText = buildAnnotatedString {
-      appendGroupMember(this, chatItem, groupMemberBold)
-      append(chatItem.content.text)
-      withStyle(reserveTimestampStyle) { append("  ${chatItem.timestampText}") }
-    }
-    SelectionContainer {
-      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
+      appendSender(this, sender, senderBold)
+      append(content.text)
+      if (metaText != null) withStyle(reserveTimestampStyle) { append(reserve + metaText) }
    }
+    Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
  } else {
+    var hasLinks = false
    val annotatedText = buildAnnotatedString {
-      appendGroupMember(this, chatItem, groupMemberBold)
-      for (ft in chatItem.formattedText) {
+      appendSender(this, sender, senderBold)
+      for (ft in formattedText) {
        if (ft.format == null) append(ft.text)
        else {
          val link = ft.link
          if (link != null) {
+            hasLinks = true
            withAnnotation(tag = "URL", annotation = link) {
              withStyle(ft.format.style) { append(ft.text) }
            }
@@ -91,60 +73,17 @@ fun MarkdownText (
          }
        }
      }
-      withStyle(reserveTimestampStyle) { append("  ${chatItem.timestampText}") }
+      if (metaText != null) withStyle(reserveTimestampStyle) { append(reserve + metaText) }
    }
-    if (uriHandler != null) {
-      SelectionContainer {
-        ClickableText(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow,
-          onClick = { offset ->
-            annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation -> uriHandler.openUri(annotation.item) }
-          }
-        )
-      }
+    if (hasLinks && uriHandler != null) {
+      ClickableText(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow,
+        onClick = { offset ->
+          annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
+            .firstOrNull()?.let { annotation -> uriHandler.openUri(annotation.item) }
+        }
+      )
    } else {
-      SelectionContainer {
-        Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
-      }
+      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
    }
  }
 }
-
-@Preview
-@Composable
-fun PreviewTextItemViewSnd() {
-  SimpleXTheme {
-    TextItemView(
-      chatItem = ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      )
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewRcv() {
-  SimpleXTheme {
-    TextItemView(
-      chatItem = ChatItem.getSampleData(
-        1, CIDirection.DirectRcv(), Clock.System.now(), "hello"
-      )
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewLong() {
-  SimpleXTheme {
-    TextItemView(
-      chatItem = ChatItem.getSampleData(
-        1,
-        CIDirection.DirectSnd(),
-        Clock.System.now(),
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-      )
-    )
-  }
-}
@@ -32,7 +32,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {
      buildAnnotatedString {
        append("You can ")
        withStyle(SpanStyle(color = MaterialTheme.colors.primary)) {
-          append("connect to SimpleX team")
+          append("connect to SimpleX Chat founder")
        }
        append(".")
      },
@@ -43,7 +43,7 @@ suspend fun openChat(chatModel: ChatModel, cInfo: ChatInfo) {
 fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
  AlertManager.shared.showAlertDialog(
    title = "Accept connection request?",
-    text = "If you choose to reject sender will NOT be notified",
+    text = "If you choose to reject sender will NOT be notified.",
    confirmText = "Accept",
    onConfirm = {
      withApi {
@@ -1,7 +1,6 @@
 package chat.simplex.app.views.chatlist

-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -16,6 +15,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.model.ChatModel
+import chat.simplex.app.ui.theme.ToolbarDark
+import chat.simplex.app.ui.theme.ToolbarLight
 import chat.simplex.app.views.chat.ChatHelpView
 import chat.simplex.app.views.newchat.NewChatSheet
 import chat.simplex.app.views.usersettings.SettingsView
@@ -76,6 +77,7 @@ fun ChatListView(chatModel: ChatModel) {
          .background(MaterialTheme.colors.background)
      ) {
        ChatListToolbar(scaffoldCtrl)
+        Divider()
        if (chatModel.chats.isNotEmpty()) {
          ChatList(chatModel)
        } else {
@@ -100,7 +102,7 @@ fun Help(scaffoldCtrl: ScaffoldController, displayName: String?) {
  Column(
    Modifier
      .fillMaxWidth()
-      .padding(8.dp)
+      .padding(16.dp)
  ) {
    Text(
      text = if (displayName != null) "Welcome ${displayName}!" else "Welcome!",
@@ -135,8 +137,9 @@ fun ChatListToolbar(scaffoldCtrl: ScaffoldController) {
    verticalAlignment = Alignment.CenterVertically,
    modifier = Modifier
      .fillMaxWidth()
+      .height(52.dp)
+      .background(if (isSystemInDarkTheme()) ToolbarDark else ToolbarLight)
      .padding(horizontal = 8.dp)
-      .height(60.dp)
  ) {
    IconButton(onClick = { scaffoldCtrl.toggleDrawer() }) {
      Icon(
@@ -149,7 +152,7 @@ fun ChatListToolbar(scaffoldCtrl: ScaffoldController) {
    Text(
      "Your chats",
      color = MaterialTheme.colors.onBackground,
-      fontWeight = FontWeight.Bold,
+      fontWeight = FontWeight.SemiBold,
      modifier = Modifier.padding(5.dp)
    )
    IconButton(onClick = { scaffoldCtrl.toggleSheet() }) {
@@ -165,7 +168,6 @@ fun ChatListToolbar(scaffoldCtrl: ScaffoldController) {

@Composable
 fun ChatList(chatModel: ChatModel) {
-  Divider(Modifier.padding(horizontal = 8.dp))
  LazyColumn(
    modifier = Modifier.fillMaxWidth()
  ) {
@@ -39,9 +39,11 @@ fun ChatPreviewView(chat: Chat) {
        fontWeight = FontWeight.Bold
      )

-      if (chat.chatItems.count() > 0) {
+      val ci = chat.chatItems.lastOrNull()
+      if (ci != null) {
        MarkdownText(
-          chat.chatItems.last(),
+          ci.content,  ci.formattedText, ci.memberDisplayName,
+          metaText = ci.timestampText,
          maxLines = 2,
          overflow = TextOverflow.Ellipsis
        )
@@ -21,6 +21,22 @@ class AlertManager {
    alertView.value = null
  }

+  fun showAlertDialogButtons(
+    title: String,
+    text: String? = null,
+    buttons: @Composable () -> Unit,
+  ) {
+    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
+    showAlert {
+      AlertDialog(
+        onDismissRequest = this::hideAlert,
+        title = { Text(title) },
+        text = alertText,
+        buttons = buttons
+      )
+    }
+  }
+
  fun showAlertDialog(
    title: String,
    text: String? = null,
@@ -1,6 +1,8 @@
 package chat.simplex.app.views.helpers

+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
@@ -8,6 +10,10 @@ import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.SupervisedUserCircle
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -20,12 +26,32 @@ fun ChatInfoImage(chat: Chat, size: Dp) {
  val icon =
    if (chat.chatInfo is ChatInfo.Group) Icons.Filled.SupervisedUserCircle
                                    else Icons.Filled.AccountCircle
+  ProfileImage(size, chat.chatInfo.image, icon)
+}
+
+@Composable
+fun ProfileImage(
+  size: Dp,
+  image: String? = null,
+  icon: ImageVector = Icons.Filled.AccountCircle
+) {
  Box(Modifier.size(size)) {
-    Icon(icon,
-      contentDescription = "Avatar Placeholder",
-      tint = MaterialTheme.colors.secondary,
-      modifier = Modifier.fillMaxSize()
-    )
+    if (image == null) {
+      Icon(
+        icon,
+        contentDescription = "profile image placeholder",
+        tint = MaterialTheme.colors.secondary,
+        modifier = Modifier.fillMaxSize()
+      )
+    } else {
+      val imageBitmap = base64ToBitmap(image).asImageBitmap()
+      Image(
+        imageBitmap,
+        "profile image",
+        contentScale = ContentScale.Crop,
+        modifier = Modifier.size(size).padding(size / 12).clip(CircleShape)
+      )
+    }
  }
 }

@@ -0,0 +1,187 @@
+package chat.simplex.app.views.helpers
+
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.*
+import android.net.Uri
+import android.provider.MediaStore
+import android.util.Base64
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.compose.ManagedActivityResultLauncher
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.CallSuper
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Collections
+import androidx.compose.material.icons.outlined.PhotoCamera
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import chat.simplex.app.BuildConfig
+import chat.simplex.app.TAG
+import chat.simplex.app.views.newchat.ActionButton
+import java.io.ByteArrayOutputStream
+import java.io.File
+
+// Inspired by https://github.com/MakeItEasyDev/Jetpack-Compose-Capture-Image-Or-Choose-from-Gallery
+
+fun bitmapToBase64(bitmap: Bitmap, squareCrop: Boolean = true): String {
+  val size = 104
+  var height = size
+  var width = size
+  var xOffset = 0
+  var yOffset = 0
+  if (bitmap.height < bitmap.width) {
+    width = height * bitmap.width / bitmap.height
+    xOffset = (width - height) / 2
+  } else {
+    height = width * bitmap.height / bitmap.width
+    yOffset = (height - width) / 2
+  }
+  var image = bitmap
+  while (image.width / 2 > width) {
+    image = Bitmap.createScaledBitmap(image, image.width / 2, image.height / 2, true)
+  }
+  image = Bitmap.createScaledBitmap(image, width, height, true)
+  if (squareCrop) {
+    image = Bitmap.createBitmap(image, xOffset, yOffset, size, size)
+  }
+  val stream = ByteArrayOutputStream()
+  image.compress(Bitmap.CompressFormat.JPEG, 85, stream)
+  return "data:image/jpg;base64," + Base64.encodeToString(stream.toByteArray(), Base64.NO_WRAP)
+}
+
+fun base64ToBitmap(base64ImageString: String) : Bitmap {
+  val imageString = base64ImageString
+    .removePrefix("data:image/png;base64,")
+    .removePrefix("data:image/jpg;base64,")
+  val imageBytes = Base64.decode(imageString, Base64.NO_WRAP)
+  return BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+}
+
+class CustomTakePicturePreview : ActivityResultContract<Void?, Bitmap?>() {
+  private var uri: Uri? = null
+  private var tmpFile: File? = null
+  lateinit var externalContext: Context
+
+  @CallSuper
+  override fun createIntent(context: Context, input: Void?): Intent {
+    externalContext = context
+    tmpFile = File.createTempFile("image", ".bmp", context.filesDir)
+    uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", tmpFile!!)
+    return Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+      .putExtra(MediaStore.EXTRA_OUTPUT, uri)
+  }
+
+  override fun getSynchronousResult(
+    context: Context,
+    input: Void?
+  ): SynchronousResult<Bitmap?>? = null
+
+  override fun parseResult(resultCode: Int, intent: Intent?): Bitmap? {
+    return if (resultCode == Activity.RESULT_OK && uri != null) {
+      val source = ImageDecoder.createSource(externalContext.contentResolver, uri!!)
+      val bitmap = ImageDecoder.decodeBitmap(source)
+      tmpFile?.delete()
+      bitmap
+    } else {
+      Log.e( TAG, "Getting image from camera cancelled or failed.")
+      tmpFile?.delete()
+      null
+    }
+  }
+}
+
+@Composable
+fun rememberGalleryLauncher(cb: (Uri?) -> Unit): ManagedActivityResultLauncher<String, Uri?> =
+  rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent(), cb)
+
+@Composable
+fun rememberCameraLauncher(cb: (Bitmap?) -> Unit): ManagedActivityResultLauncher<Void?, Bitmap?> =
+  rememberLauncherForActivityResult(contract = CustomTakePicturePreview(), cb)
+
+@Composable
+fun rememberPermissionLauncher(cb: (Boolean) -> Unit): ManagedActivityResultLauncher<String, Boolean> =
+  rememberLauncherForActivityResult(contract = ActivityResultContracts.RequestPermission(), cb)
+
+@Composable
+fun GetImageBottomSheet(
+  profileImageStr: MutableState<String?>,
+  hideBottomSheet: () -> Unit
+) {
+  val context = LocalContext.current
+  val isCameraSelected = remember { mutableStateOf (false) }
+
+  val galleryLauncher = rememberGalleryLauncher { uri: Uri? ->
+    if (uri != null) {
+      val source = ImageDecoder.createSource(context.contentResolver, uri)
+      val bitmap = ImageDecoder.decodeBitmap(source)
+      profileImageStr.value = bitmapToBase64(bitmap)
+    }
+  }
+
+  val cameraLauncher = rememberCameraLauncher { bitmap: Bitmap? ->
+    if (bitmap != null) profileImageStr.value = bitmapToBase64(bitmap)
+  }
+
+  val permissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
+    if (isGranted) {
+      if (isCameraSelected.value) cameraLauncher.launch(null)
+      else galleryLauncher.launch("image/*")
+      hideBottomSheet()
+    } else {
+      Toast.makeText(context, "Permission Denied!", Toast.LENGTH_SHORT).show()
+    }
+  }
+
+  Box(
+    modifier = Modifier
+      .fillMaxWidth()
+      .wrapContentHeight()
+      .onFocusChanged { focusState ->
+        if (!focusState.hasFocus) hideBottomSheet()
+      }
+  ) {
+    Row(
+      Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 8.dp, vertical = 30.dp),
+      horizontalArrangement = Arrangement.SpaceEvenly
+    ) {
+      ActionButton(null, "Use Camera", icon = Icons.Outlined.PhotoCamera) {
+        when (PackageManager.PERMISSION_GRANTED) {
+          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
+            cameraLauncher.launch(null)
+            hideBottomSheet()
+          }
+          else -> {
+            isCameraSelected.value = true
+            permissionLauncher.launch(Manifest.permission.CAMERA)
+          }
+        }
+      }
+      ActionButton(null, "From Gallery", icon = Icons.Outlined.Collections) {
+        when (PackageManager.PERMISSION_GRANTED) {
+          ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) -> {
+            galleryLauncher.launch("image/*")
+            hideBottomSheet()
+          }
+          else -> {
+            isCameraSelected.value = false
+            permissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+          }
+        }
+      }
+    }
+  }
+}
@@ -1,7 +1,7 @@
 package chat.simplex.app.views.helpers

-import android.content.Context
-import android.content.Intent
+import android.content.*
+import androidx.core.content.ContextCompat

 fun shareText(cxt: Context, text: String) {
  val sendIntent: Intent = Intent().apply {
@@ -12,3 +12,8 @@ fun shareText(cxt: Context, text: String) {
  val shareIntent = Intent.createChooser(sendIntent, null)
  cxt.startActivity(shareIntent)
 }
+
+fun copyText(cxt: Context, text: String) {
+  val clipboard = ContextCompat.getSystemService(cxt, ClipboardManager::class.java)
+  clipboard?.setPrimaryClip(ClipData.newPlainText("text", text))
+}
@@ -43,11 +43,11 @@ fun AddContactLayout(connReq: String, share: () -> Unit) {
    ) {
      Text(
        "Add contact",
-        style = MaterialTheme.typography.h1,
+        style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
      )
      Text(
        "Show QR code to your contact\nto scan from the app",
-        style = MaterialTheme.typography.h2.copy(fontSize = if(screenHeight > 600.dp) 26.sp else 20.sp),
+        style = MaterialTheme.typography.h3,
        textAlign = TextAlign.Center,
      )
      QRCode(
@@ -76,11 +76,11 @@ fun ConnectContactLayout(qrCodeScanner: @Composable () -> Unit, close: () -> Uni
    ) {
      Text(
        "Scan QR code",
-        style = MaterialTheme.typography.h1,
+        style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
      )
      Text(
        "Your chat profile will be sent\nto your contact",
-        style = MaterialTheme.typography.h2,
+        style = MaterialTheme.typography.h3,
        textAlign = TextAlign.Center,
        modifier = Modifier.padding(bottom = 4.dp)
      )
@@ -83,7 +83,7 @@ fun NewChatSheetLayout(addContact: () -> Unit, scanCode: () -> Unit) {
 }

@Composable
-fun ActionButton(text: String, comment: String, icon: ImageVector, disabled: Boolean = false,
+fun ActionButton(text: String?, comment: String?, icon: ImageVector, disabled: Boolean = false,
                 click: () -> Unit = {}) {
  Column(
    Modifier
@@ -97,16 +97,22 @@ fun ActionButton(text: String, comment: String, icon: ImageVector, disabled: Boo
      modifier = Modifier
        .size(40.dp)
        .padding(bottom = 8.dp))
-    Text(text,
-      textAlign = TextAlign.Center,
-      fontWeight = FontWeight.Bold,
-      color = tint,
-      modifier = Modifier.padding(bottom = 4.dp)
-    )
-    Text(comment,
-      textAlign = TextAlign.Center,
-      style = MaterialTheme.typography.body2
-    )
+    if (text != null) {
+      Text(
+        text,
+        textAlign = TextAlign.Center,
+        fontWeight = FontWeight.Bold,
+        color = tint,
+        modifier = Modifier.padding(bottom = 4.dp)
+      )
+    }
+    if (comment != null) {
+      Text(
+        comment,
+        textAlign = TextAlign.Center,
+        style = MaterialTheme.typography.body2
+      )
+    }
  }
 }

@@ -16,7 +16,7 @@ import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
 fun MarkdownHelpView() {
-  Column(Modifier.padding(horizontal = 16.dp)) {
+  Column {
    Text(
      "How to use markdown",
      style = MaterialTheme.typography.h1,
@@ -21,7 +21,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.AlertManager
 import chat.simplex.app.views.helpers.withApi

@@ -60,7 +61,7 @@ fun SMPServersView(chatModel: ChatModel) {
            if (userSMPServers.isNotEmpty()) {
              AlertManager.shared.showAlertMsg(
                title = "Use SimpleX Chat servers?",
-                text = "Saved SMP servers will be removed",
+                text = "Saved SMP servers will be removed.",
                confirmText = "Confirm",
                onConfirm = {
                  saveSMPServers(listOf())
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
@@ -17,11 +17,14 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import chat.simplex.app.BuildConfig
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
+import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.TerminalView
+import chat.simplex.app.views.helpers.ProfileImage
 import chat.simplex.app.views.newchat.ModalManager

@Composable
@@ -30,7 +33,13 @@ fun SettingsView(chatModel: ChatModel) {
  if (user != null) {
    SettingsLayout(
      profile = user.profile,
+      runServiceInBackground = chatModel.runServiceInBackground,
+      setRunServiceInBackground = { on ->
+        chatModel.controller.setRunServiceInBackground(on)
+        chatModel.runServiceInBackground.value = on
+      },
      showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
+      showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } }
    )
  }
@@ -42,7 +51,10 @@ val simplexTeamUri =
@Composable
 fun SettingsLayout(
  profile: Profile,
+  runServiceInBackground: MutableState<Boolean>,
+  setRunServiceInBackground: (Boolean) -> Unit,
  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
  showTerminal: () -> Unit
 ) {
  val uriHandler = LocalUriHandler.current
@@ -59,17 +71,14 @@ fun SettingsLayout(
        .padding(top = 16.dp)
    ) {
      Text(
-        "Your Settings",
+        "Your settings",
        style = MaterialTheme.typography.h1,
        modifier = Modifier.padding(start = 8.dp)
      )
      Spacer(Modifier.height(30.dp))

-      SettingsSectionView(showModal { UserProfileView(it) }, 60.dp) {
-        Icon(
-          Icons.Outlined.AccountCircle,
-          contentDescription = "Avatar Placeholder",
-        )
+      SettingsSectionView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp) {
+        ProfileImage(size = 60.dp, profile.image)
        Spacer(Modifier.padding(horizontal = 4.dp))
        Column {
          Text(
@@ -116,7 +125,7 @@ fun SettingsLayout(
        )
        Spacer(Modifier.padding(horizontal = 4.dp))
        Text(
-          "Get help & advice via chat",
+          "Chat with the founder",
          color = MaterialTheme.colors.primary
        )
      }
@@ -128,7 +137,7 @@ fun SettingsLayout(
        )
        Spacer(Modifier.padding(horizontal = 4.dp))
        Text(
-          "Ask questions via email",
+          "Send us email",
          color = MaterialTheme.colors.primary
        )
      }
@@ -143,6 +152,27 @@ fun SettingsLayout(
        Text("SMP servers")
      }
      Divider(Modifier.padding(horizontal = 8.dp))
+      SettingsSectionView() {
+        Icon(
+          Icons.Outlined.Bolt,
+          contentDescription = "Private notifications",
+        )
+        Spacer(Modifier.padding(horizontal = 4.dp))
+        Text("Private notifications", Modifier
+          .padding(end = 24.dp)
+          .fillMaxWidth()
+          .weight(1F))
+        Switch(
+          checked = runServiceInBackground.value,
+          onCheckedChange = { setRunServiceInBackground(it) },
+          colors = SwitchDefaults.colors(
+            checkedThumbColor = MaterialTheme.colors.primary,
+            uncheckedThumbColor = HighOrLowlight
+          ),
+          modifier = Modifier.padding(end = 8.dp)
+        )
+      }
+      Divider(Modifier.padding(horizontal = 8.dp))
      SettingsSectionView(showTerminal) {
        Icon(
          painter = painterResource(id = R.drawable.ic_outline_terminal),
@@ -167,21 +197,25 @@ fun SettingsLayout(
          }
        )
      }
+      Divider(Modifier.padding(horizontal = 8.dp))
+      SettingsSectionView() {
+        Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+      }
    }
  }
 }

@Composable
-fun SettingsSectionView(click: () -> Unit, height: Dp = 48.dp, content: (@Composable () -> Unit)) {
+fun SettingsSectionView(click: (() -> Unit)? = null, height: Dp = 46.dp, content: (@Composable () -> Unit)) {
+  val modifier = Modifier
+    .padding(start = 8.dp)
+    .fillMaxWidth()
+    .height(height)
  Row(
-    Modifier
-      .padding(start = 8.dp)
-      .fillMaxWidth()
-      .clickable(onClick = click)
-      .height(height),
+    if (click == null) modifier else modifier.clickable(onClick = click),
    verticalAlignment = Alignment.CenterVertically
  ) {
-    content.invoke()
+    content()
  }
 }

@@ -196,7 +230,10 @@ fun PreviewSettingsLayout() {
  SimpleXTheme {
    SettingsLayout(
      profile = Profile.sampleData,
+      runServiceInBackground = remember { mutableStateOf(true) },
+      setRunServiceInBackground = {},
      showModal = {{}},
+      showCustomModal = {{}},
      showTerminal = {}
    )
  }
@@ -33,7 +33,7 @@ fun UserAddressView(chatModel: ChatModel) {
    deleteAddress = {
      AlertManager.shared.showAlertMsg(
        title = "Delete address?",
-        text = "All your contacts will remain connected",
+        text = "All your contacts will remain connected.",
        confirmText = "Delete",
        onConfirm = {
          withApi {
@@ -1,15 +1,20 @@
 package chat.simplex.app.views.usersettings

 import android.content.res.Configuration
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.PhotoCamera
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.tooling.preview.Preview
@@ -17,29 +22,31 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
 import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.withApi
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.newchat.ModalView
+import com.google.accompanist.insets.ProvideWindowInsets
+import com.google.accompanist.insets.navigationBarsWithImePadding
+import kotlinx.coroutines.launch

@Composable
-fun UserProfileView(chatModel: ChatModel) {
+fun UserProfileView(chatModel: ChatModel, close: () -> Unit) {
  val user = chatModel.currentUser.value
  if (user != null) {
-    var editProfile by remember { mutableStateOf(false) }
+    var editProfile = remember { mutableStateOf(false) }
    var profile by remember { mutableStateOf(user.profile) }
    UserProfileLayout(
+      close = close,
      editProfile = editProfile,
      profile = profile,
-      editProfileOff = { editProfile = false },
-      editProfileOn = { editProfile = true },
-      saveProfile = { displayName: String, fullName: String ->
+      saveProfile = { displayName, fullName, image ->
        withApi {
-          val newProfile = chatModel.controller.apiUpdateProfile(
-            profile = Profile(displayName, fullName)
-          )
+          val p = Profile(displayName, fullName, image)
+          val newProfile = chatModel.controller.apiUpdateProfile(p)
          if (newProfile != null) {
            chatModel.updateUserProfile(newProfile)
            profile = newProfile
          }
-          editProfile = false
+          editProfile.value = false
        }
      }
    )
@@ -48,119 +55,192 @@ fun UserProfileView(chatModel: ChatModel) {

@Composable
 fun UserProfileLayout(
-  editProfile: Boolean,
+  close: () -> Unit,
+  editProfile: MutableState<Boolean>,
  profile: Profile,
-  editProfileOff: () -> Unit,
-  editProfileOn: () -> Unit,
-  saveProfile: (String, String) -> Unit,
+  saveProfile: (String, String, String?) -> Unit,
 ) {
-  Column(horizontalAlignment = Alignment.Start) {
-    Text(
-      "Your chat profile",
-      Modifier.padding(bottom = 24.dp),
-      style = MaterialTheme.typography.h1,
-      color = MaterialTheme.colors.onBackground
-    )
-    Text(
-      "Your profile is stored on your device and shared only with your contacts.\n" +
-          "SimpleX servers cannot see your profile.",
-      Modifier.padding(bottom = 24.dp),
-      color = MaterialTheme.colors.onBackground
-    )
-    if (editProfile) {
-      var displayName by remember { mutableStateOf(profile.displayName) }
-      var fullName by remember { mutableStateOf(profile.fullName) }
-      Column(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalAlignment = Alignment.Start
-      ) {
-        // TODO hints
-        BasicTextField(
-          value = displayName,
-          onValueChange = { displayName = it },
-          modifier = Modifier
-            .padding(bottom = 24.dp)
-            .fillMaxWidth(),
-          textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-          keyboardOptions = KeyboardOptions(
-            capitalization = KeyboardCapitalization.None,
-            autoCorrect = false
-          ),
-          singleLine = true
-        )
-        BasicTextField(
-          value = fullName,
-          onValueChange = { fullName = it },
-          modifier = Modifier
-            .padding(bottom = 24.dp)
-            .fillMaxWidth(),
-          textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-          keyboardOptions = KeyboardOptions(
-            capitalization = KeyboardCapitalization.None,
-            autoCorrect = false
-          ),
-          singleLine = true
-        )
-        Row {
-          Text(
-            "Cancel",
-            color = MaterialTheme.colors.primary,
-            modifier = Modifier
-              .clickable(onClick = editProfileOff),
-          )
-          Spacer(Modifier.padding(horizontal = 8.dp))
-          Text(
-            "Save (and notify contacts)",
-            color = MaterialTheme.colors.primary,
-            modifier = Modifier
-              .clickable(onClick = { saveProfile(displayName, fullName) })
-          )
-        }
-      }
-    } else {
-      Column(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalAlignment = Alignment.Start
-      ) {
-        Row(
-          Modifier.padding(bottom = 24.dp)
+  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
+  val displayName = remember { mutableStateOf(profile.displayName) }
+  val fullName = remember { mutableStateOf(profile.fullName) }
+  val profileImage = remember { mutableStateOf(profile.image) }
+  val scope = rememberCoroutineScope()
+  val scrollState = rememberScrollState()
+  val keyboardState by getKeyboardState()
+  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
+
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    ModalBottomSheetLayout(
+      scrimColor = Color.Black.copy(alpha = 0.12F),
+      modifier = Modifier.navigationBarsWithImePadding(),
+      sheetContent = {
+        GetImageBottomSheet(profileImage, hideBottomSheet = {
+          scope.launch { bottomSheetModalState.hide() }
+        })
+      },
+      sheetState = bottomSheetModalState,
+      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
+    ) {
+      ModalView(close = close) {
+        Column(
+          Modifier
+            .verticalScroll(scrollState)
+            .padding(bottom = 16.dp),
+          horizontalAlignment = Alignment.Start
        ) {
          Text(
-            "Display name:",
+            "Your chat profile",
+            Modifier.padding(bottom = 24.dp),
+            style = MaterialTheme.typography.h1,
            color = MaterialTheme.colors.onBackground
          )
-          Spacer(Modifier.padding(horizontal = 4.dp))
          Text(
-            profile.displayName,
-            fontWeight = FontWeight.Bold,
+            "Your profile is stored on your device and shared only with your contacts.\n\n" +
+                "SimpleX servers cannot see your profile.",
+            Modifier.padding(bottom = 24.dp),
            color = MaterialTheme.colors.onBackground
          )
+          if (editProfile.value) {
+            Column(
+              Modifier.fillMaxWidth(),
+              horizontalAlignment = Alignment.Start
+            ) {
+              Box(
+                Modifier
+                  .fillMaxWidth()
+                  .padding(bottom = 24.dp),
+                contentAlignment = Alignment.Center
+              ) {
+                Box(contentAlignment = Alignment.TopEnd) {
+                  Box(contentAlignment = Alignment.Center) {
+                    ProfileImage(192.dp, profileImage.value)
+                    EditImageButton { scope.launch { bottomSheetModalState.show() } }
+                  }
+                  if (profileImage.value != null) {
+                    DeleteImageButton { profileImage.value = null }
+                  }
+                }
+              }
+              ProfileNameTextField(displayName)
+              ProfileNameTextField(fullName)
+              Row {
+                TextButton("Cancel") {
+                  displayName.value = profile.displayName
+                  fullName.value = profile.fullName
+                  profileImage.value = profile.image
+                  editProfile.value = false
+                }
+                Spacer(Modifier.padding(horizontal = 8.dp))
+                TextButton("Save (and notify contacts)") {
+                  saveProfile(displayName.value, fullName.value, profileImage.value)
+                }
+              }
+            }
+          } else {
+            Column(
+              modifier = Modifier.fillMaxWidth(),
+              horizontalAlignment = Alignment.Start
+            ) {
+              Box(
+                Modifier
+                  .fillMaxWidth()
+                  .padding(bottom = 24.dp), contentAlignment = Alignment.Center
+              ) {
+                ProfileImage(192.dp, profile.image)
+                if (profile.image == null) {
+                  EditImageButton {
+                    editProfile.value = true
+                    scope.launch { bottomSheetModalState.show() }
+                  }
+                }
+              }
+              ProfileNameRow("Display name:", profile.displayName)
+              ProfileNameRow("Full name:", profile.fullName)
+              TextButton("Edit") { editProfile.value = true }
+            }
+          }
+          if (savedKeyboardState != keyboardState) {
+            LaunchedEffect(keyboardState) {
+              scope.launch {
+                savedKeyboardState = keyboardState
+                scrollState.animateScrollTo(scrollState.maxValue)
+              }
+            }
+          }
        }
-        Row(
-          Modifier.padding(bottom = 24.dp)
-        ) {
-          Text(
-            "Full name:",
-            color = MaterialTheme.colors.onBackground
-          )
-          Spacer(Modifier.padding(horizontal = 4.dp))
-          Text(
-            profile.fullName,
-            fontWeight = FontWeight.Bold,
-            color = MaterialTheme.colors.onBackground
-          )
-        }
-        Text(
-          "Edit",
-          color = MaterialTheme.colors.primary,
-          modifier = Modifier
-            .clickable(onClick = editProfileOn)
-        )
      }
    }
  }
 }

+@Composable
+private fun ProfileNameTextField(name: MutableState<String>) {
+  BasicTextField(
+    value = name.value,
+    onValueChange = { name.value = it },
+    modifier = Modifier
+      .padding(bottom = 24.dp)
+      .fillMaxWidth(),
+    textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
+    keyboardOptions = KeyboardOptions(
+      capitalization = KeyboardCapitalization.None,
+      autoCorrect = false
+    ),
+    singleLine = true
+  )
+}
+
+@Composable
+private fun ProfileNameRow(label: String, text: String) {
+  Row(Modifier.padding(bottom = 24.dp)) {
+    Text(
+      label,
+      color = MaterialTheme.colors.onBackground
+    )
+    Spacer(Modifier.padding(horizontal = 4.dp))
+    Text(
+      text,
+      fontWeight = FontWeight.Bold,
+      color = MaterialTheme.colors.onBackground
+    )
+  }
+}
+
+@Composable
+private fun TextButton(text: String, click: () -> Unit) {
+  Text(
+    text,
+    color = MaterialTheme.colors.primary,
+    modifier = Modifier.clickable(onClick = click),
+  )
+}
+
+@Composable
+fun EditImageButton(click: () -> Unit) {
+  IconButton(
+    onClick = click,
+    modifier = Modifier.background(Color(1f, 1f, 1f, 0.2f), shape = CircleShape)
+  ) {
+    Icon(
+      Icons.Outlined.PhotoCamera,
+      contentDescription = "Edit image",
+      tint = MaterialTheme.colors.primary,
+      modifier = Modifier.size(36.dp)
+    )
+  }
+}
+
+@Composable
+fun DeleteImageButton(click: () -> Unit) {
+  IconButton(onClick = click) {
+    Icon(
+      Icons.Outlined.Close,
+      contentDescription = "Delete image",
+      tint = MaterialTheme.colors.primary,
+    )
+  }
+}
+
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -171,11 +251,10 @@ fun UserProfileLayout(
 fun PreviewUserProfileLayoutEditOff() {
  SimpleXTheme {
    UserProfileLayout(
+      close = {},
      profile = Profile.sampleData,
-      editProfile = false,
-      editProfileOff = {},
-      editProfileOn = {},
-      saveProfile = { _, _ -> }
+      editProfile = remember { mutableStateOf(false) },
+      saveProfile = { _, _, _ -> }
    )
  }
 }
@@ -190,11 +269,10 @@ fun PreviewUserProfileLayoutEditOff() {
 fun PreviewUserProfileLayoutEditOn() {
  SimpleXTheme {
    UserProfileLayout(
+      close = {},
      profile = Profile.sampleData,
-      editProfile = true,
-      editProfileOff = {},
-      editProfileOn = {},
-      saveProfile = { _, _ -> }
+      editProfile = remember { mutableStateOf(true) },
+      saveProfile = {_, _, _ ->}
    )
  }
 }
@@ -1,3 +1,7 @@
 <resources>
  <string name="app_name">SimpleX</string>
-</resources>
+
+  <!-- SimpleX Chat foreground Service -->
+  <string name="simplex_service_notification_title">SimpleX Chat service</string>
+  <string name="simplex_service_notification_text">Waiting for incoming messages</string>
+</resources>
@@ -0,0 +1,3 @@
+<paths>
+    <files-path name="my_files" path="/"/>
+</paths>
@@ -1,6 +1,6 @@
 buildscript {
    ext {
-        compose_version = '1.1.0'
+        compose_version = '1.1.1'
    }
    repositories {
        google()
@@ -135,6 +135,23 @@ final class ChatModel: ObservableObject {
            return res
        }
    }
+    
+    func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // update previews
+        if let chat = getChat(cInfo.id) {
+            if let pItem = chat.chatItems.last, pItem.id == cItem.id {
+                chat.chatItems = [cItem]
+            }
+        }
+        // remove from current chat
+        if chatId == cInfo.id {
+            if let i = chatItems.firstIndex(where: { $0.id == cItem.id }) {
+                _ = withAnimation {
+                    self.chatItems.remove(at: i)
+                }
+            }
+        }
+    }

    func markChatItemsRead(_ cInfo: ChatInfo) {
        // update preview
@@ -164,6 +181,14 @@ final class ChatModel: ObservableObject {
        }
    }

+    func getPrevChatItem(_ ci: ChatItem) -> ChatItem? {
+        if let i = chatItems.firstIndex(where: { $0.id == ci.id }), i > 0  {
+            return chatItems[i - 1]
+        } else {
+            return nil
+        }
+    }
+    
    func popChat(_ id: String) {
        if let i = getChatIndex(id) {
            popChat_(i)
@@ -190,8 +215,8 @@ struct User: Decodable, NamedChat {
    var activeUser: Bool

    var displayName: String { get { profile.displayName } }
-
    var fullName: String { get { profile.fullName } }
+    var image: String? { get { profile.image } }

    static let sampleData = User(
        userId: 1,
@@ -209,6 +234,7 @@ typealias GroupName = String
 struct Profile: Codable, NamedChat {
    var displayName: String
    var fullName: String
+    var image: String?

    static let sampleData = Profile(
        displayName: "alice",
@@ -225,6 +251,7 @@ enum ChatType: String {
 protocol NamedChat {
    var displayName: String { get }
    var fullName: String { get }
+    var image: String? { get }
 }

 extension NamedChat {
@@ -270,6 +297,16 @@ enum ChatInfo: Identifiable, Decodable, NamedChat {
        }
    }

+    var image: String? {
+        get {
+            switch self {
+            case let .direct(contact): return contact.image
+            case let .group(groupInfo): return groupInfo.image
+            case let .contactRequest(contactRequest): return contactRequest.image
+            }
+        }
+    }
+
    var id: ChatId {
        get {
            switch self {
@@ -360,9 +397,9 @@ final class Chat: ObservableObject, Identifiable {
        var statusExplanation: String {
            get {
                switch self {
-                case .connected: return "You are connected to the server you use to receve messages from this contact."
-                case let .error(err): return "Trying to connect to the server you use to receve messages from this contact (error: \(err))."
-                default: return "Trying to connect to the server you use to receve messages from this contact."
+                case .connected: return "You are connected to the server used to receive messages from this contact."
+                case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
+                default: return "Trying to connect to the server used to receive messages from this contact."
                }
            }
        }
@@ -420,6 +457,7 @@ struct Contact: Identifiable, Decodable, NamedChat {
    var ready: Bool { get { activeConn.connStatus == "ready" || activeConn.connStatus == "snd-ready" } }
    var displayName: String { get { profile.displayName } }
    var fullName: String { get { profile.fullName } }
+    var image: String? { get { profile.image } }

    static let sampleData = Contact(
        contactId: 1,
@@ -452,6 +490,7 @@ struct UserContactRequest: Decodable, NamedChat {
    var ready: Bool { get { true } }
    var displayName: String { get { profile.displayName } }
    var fullName: String { get { profile.fullName } }
+    var image: String? { get { profile.image } }

    static let sampleData = UserContactRequest(
        contactRequestId: 1,
@@ -472,6 +511,7 @@ struct GroupInfo: Identifiable, Decodable, NamedChat {
    var ready: Bool { get { true } }
    var displayName: String { get { groupProfile.displayName } }
    var fullName: String { get { groupProfile.fullName } }
+    var image: String? { get { groupProfile.image } }

    static let sampleData = GroupInfo(
        groupId: 1,
@@ -484,6 +524,7 @@ struct GroupInfo: Identifiable, Decodable, NamedChat {
 struct GroupProfile: Codable, NamedChat {
    var displayName: String
    var fullName: String
+    var image: String?

    static let sampleData = GroupProfile(
        displayName: "team",
@@ -503,6 +544,16 @@ struct GroupMember: Decodable {
    var memberContactId: Int64?
 //    var activeConn: Connection?

+    var directChatId: ChatId? {
+        get {
+            if let chatId = memberContactId {
+                return "@\(chatId)"
+            } else {
+                return nil
+            }
+        }
+    }
+
    static let sampleData = GroupMember(
        groupMemberId: 1,
        memberId: "abcd",
@@ -527,7 +578,8 @@ struct ChatItem: Identifiable, Decodable {
    var meta: CIMeta
    var content: CIContent
    var formattedText: [FormattedText]?
-    
+    var quotedItem: CIQuote?
+
    var id: Int64 { get { meta.itemId } }

    var timestampText: Text { get { meta.timestampText } }
@@ -536,12 +588,48 @@ struct ChatItem: Identifiable, Decodable {
        if case .rcvNew = meta.itemStatus { return true }
        return false
    }
+    
+    func isMsgContent() -> Bool {
+        switch content {
+        case .sndMsgContent: return true
+        case .rcvMsgContent: return true
+        default: return false
+        }
+    }

-    static func getSample (_ id: Int64, _ dir: CIDirection, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew) -> ChatItem {
+    func isDeletedContent() -> Bool {
+        switch content {
+        case .sndDeleted: return true
+        case .rcvDeleted: return true
+        default: return false
+        }
+    }
+
+    var memberDisplayName: String? {
+        get {
+            if case let .groupRcv(groupMember) = chatDir {
+                return groupMember.memberProfile.displayName
+            } else {
+                return nil
+            }
+        }
+    }
+    
+    static func getSample (_ id: Int64, _ dir: CIDirection, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, quotedItem: CIQuote? = nil, _ itemDeleted: Bool = false, _ itemEdited: Bool = false, _ editable: Bool = true) -> ChatItem {
        ChatItem(
-           chatDir: dir,
-           meta: CIMeta.getSample(id, ts, text, status),
-           content: .sndMsgContent(msgContent: .text(text))
+            chatDir: dir,
+            meta: CIMeta.getSample(id, ts, text, status, itemDeleted, itemEdited, editable),
+            content: .sndMsgContent(msgContent: .text(text)),
+            quotedItem: quotedItem
+       )
+    }
+    
+    static func getDeletedContentSample (_ id: Int64 = 1, dir: CIDirection = .directRcv, _ ts: Date = .now, _ text: String = "this item is deleted", _ status: CIStatus = .rcvRead) -> ChatItem {
+        ChatItem(
+            chatDir: dir,
+            meta: CIMeta.getSample(id, ts, text, status, false, false, false),
+            content: .rcvDeleted(deleteMode: .cidmBroadcast),
+            quotedItem: nil
       )
    }
 }
@@ -570,16 +658,22 @@ struct CIMeta: Decodable {
    var itemText: String
    var itemStatus: CIStatus
    var createdAt: Date
+    var itemDeleted: Bool
+    var itemEdited: Bool
+    var editable: Bool

    var timestampText: Text { get { SimpleX.timestampText(itemTs) } }

-    static func getSample(_ id: Int64, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew) -> CIMeta {
+    static func getSample(_ id: Int64, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, _ itemDeleted: Bool = false, _ itemEdited: Bool = false, _ editable: Bool = true) -> CIMeta {
        CIMeta(
            itemId: id,
            itemTs: ts,
            itemText: text,
            itemStatus: status,
-            createdAt: ts
+            createdAt: ts,
+            itemDeleted: itemDeleted,
+            itemEdited: itemEdited,
+            editable: editable
        )
    }
 }
@@ -603,9 +697,20 @@ enum CIStatus: Decodable {
    case rcvRead
 }

-enum CIContent: Decodable {
+enum CIDeleteMode: String, Decodable {
+    case cidmBroadcast = "broadcast"
+    case cidmInternal = "internal"
+}
+
+protocol ItemContent {
+    var text: String { get }
+}
+
+enum CIContent: Decodable, ItemContent {
    case sndMsgContent(msgContent: MsgContent)
    case rcvMsgContent(msgContent: MsgContent)
+    case sndDeleted(deleteMode: CIDeleteMode)
+    case rcvDeleted(deleteMode: CIDeleteMode)
    case sndFileInvitation(fileId: Int64, filePath: String)
    case rcvFileInvitation(rcvFileTransfer: RcvFileTransfer)

@@ -614,6 +719,8 @@ enum CIContent: Decodable {
            switch self {
            case let .sndMsgContent(mc): return mc.text
            case let .rcvMsgContent(mc): return mc.text
+            case .sndDeleted: return "deleted"
+            case .rcvDeleted: return "deleted"
            case .sndFileInvitation: return "sending files is not supported yet"
            case .rcvFileInvitation: return  "receiving files is not supported yet"
            }
@@ -625,6 +732,33 @@ struct RcvFileTransfer: Decodable {

 }

+struct CIQuote: Decodable, ItemContent {
+    var chatDir: CIDirection?
+    var itemId: Int64?
+    var sharedMsgId: String? = nil
+    var sentAt: Date
+    var content: MsgContent
+    var formattedText: [FormattedText]?
+    
+    var text: String { get { content.text } }
+
+    var sender: String? {
+        get {
+            switch (chatDir) {
+            case .directSnd: return "you"
+            case .directRcv: return nil
+            case .groupSnd: return ChatModel.shared.currentUser?.displayName
+            case let .groupRcv(member): return member.memberProfile.displayName
+            case nil: return nil
+            }
+        }
+    }
+
+    static func getSample(_ itemId: Int64?, _ sentAt: Date, _ text: String, chatDir: CIDirection?) -> CIQuote {
+        CIQuote(chatDir: chatDir, itemId: itemId, sentAt: sentAt, content: .text(text))
+    }
+}
+
 enum MsgContent {
    case text(String)
    // TODO include original JSON, possibly using https://github.com/zoul/generic-json-swift
@@ -162,11 +162,27 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        addNotification(
            categoryIdentifier: ntfCategoryMessageReceived,
            title: "\(cInfo.chatViewName):",
-            body: cItem.content.text,
+            body: hideSecrets(cItem),
            targetContentIdentifier: cInfo.id
 //            userInfo: ["chatId": cInfo.id, "chatItemId": cItem.id]
        )
    }
+    
+    func hideSecrets(_ cItem: ChatItem) -> String {
+        if let md = cItem.formattedText {
+            var res = ""
+            for ft in md {
+                if case .secret = ft.format {
+                    res = res + "..."
+                } else {
+                    res = res + ft.text
+                }
+            }
+            return res
+        } else {
+            return cItem.content.text
+        }
+    }

    private func addNotification(categoryIdentifier: String, title: String, subtitle: String? = nil, body: String? = nil,
                                 targetContentIdentifier: String? = nil, userInfo: [AnyHashable : Any] = [:]) {
@@ -22,12 +22,15 @@ enum ChatCommand {
    case apiGetChats
    case apiGetChat(type: ChatType, id: Int64)
    case apiSendMessage(type: ChatType, id: Int64, msg: MsgContent)
+    case apiSendMessageQuote(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent)
+    case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent)
+    case apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode)
    case getUserSMPServers
    case setUserSMPServers(smpServers: [String])
    case addContact
    case connect(connReq: String)
    case apiDeleteChat(type: ChatType, id: Int64)
-    case updateProfile(profile: Profile)
+    case apiUpdateProfile(profile: Profile)
    case createMyAddress
    case deleteMyAddress
    case showMyAddress
@@ -45,12 +48,15 @@ enum ChatCommand {
            case .apiGetChats: return "/_get chats"
            case let .apiGetChat(type, id): return "/_get chat \(ref(type, id)) count=100"
            case let .apiSendMessage(type, id, mc): return "/_send \(ref(type, id)) \(mc.cmdString)"
+            case let .apiSendMessageQuote(type, id, itemId, mc): return "/_send_quote \(ref(type, id)) \(itemId) \(mc.cmdString)"
+            case let .apiUpdateChatItem(type, id, itemId, mc): return "/_update item \(ref(type, id)) \(itemId) \(mc.cmdString)"
+            case let .apiDeleteChatItem(type, id, itemId, mode): return "/_delete item \(ref(type, id)) \(itemId) \(mode.rawValue)"
            case .getUserSMPServers: return "/smp_servers"
            case let .setUserSMPServers(smpServers): return "/smp_servers \(smpServersStr(smpServers: smpServers))"
            case .addContact: return "/connect"
            case let .connect(connReq): return "/connect \(connReq)"
            case let .apiDeleteChat(type, id): return "/_delete \(ref(type, id))"
-            case let .updateProfile(profile): return "/profile \(profile.displayName) \(profile.fullName)"
+            case let .apiUpdateProfile(profile): return "/_profile \(encodeJSON(profile))"
            case .createMyAddress: return "/address"
            case .deleteMyAddress: return "/delete_address"
            case .showMyAddress: return "/show_address"
@@ -71,12 +77,15 @@ enum ChatCommand {
            case .apiGetChats: return "apiGetChats"
            case .apiGetChat: return "apiGetChat"
            case .apiSendMessage: return "apiSendMessage"
+            case .apiSendMessageQuote: return "apiSendMessageQuote"
+            case .apiUpdateChatItem: return "apiUpdateChatItem"
+            case .apiDeleteChatItem: return "apiDeleteChatItem"
            case .getUserSMPServers: return "getUserSMPServers"
            case .setUserSMPServers: return "setUserSMPServers"
            case .addContact: return "addContact"
            case .connect: return "connect"
            case .apiDeleteChat: return "apiDeleteChat"
-            case .updateProfile: return "updateProfile"
+            case .apiUpdateProfile: return "apiUpdateProfile"
            case .createMyAddress: return "createMyAddress"
            case .deleteMyAddress: return "deleteMyAddress"
            case .showMyAddress: return "showMyAddress"
@@ -132,7 +141,9 @@ enum ChatResponse: Decodable, Error {
    case groupEmpty(groupInfo: GroupInfo)
    case userContactLinkSubscribed
    case newChatItem(chatItem: AChatItem)
+    case chatItemStatusUpdated(chatItem: AChatItem)
    case chatItemUpdated(chatItem: AChatItem)
+    case chatItemDeleted(deletedChatItem: AChatItem, toChatItem: AChatItem)
    case cmdOk
    case chatCmdError(chatError: ChatError)
    case chatError(chatError: ChatError)
@@ -152,7 +163,7 @@ enum ChatResponse: Decodable, Error {
            case .sentInvitation: return "sentInvitation"
            case .contactDeleted: return "contactDeleted"
            case .userProfileNoChange: return "userProfileNoChange"
-            case .userProfileUpdated: return "userProfileNoChange"
+            case .userProfileUpdated: return "userProfileUpdated"
            case .userContactLink: return "userContactLink"
            case .userContactLinkCreated: return "userContactLinkCreated"
            case .userContactLinkDeleted: return "userContactLinkDeleted"
@@ -170,7 +181,9 @@ enum ChatResponse: Decodable, Error {
            case .groupEmpty: return "groupEmpty"
            case .userContactLinkSubscribed: return "userContactLinkSubscribed"
            case .newChatItem: return "newChatItem"
+            case .chatItemStatusUpdated: return "chatItemStatusUpdated"
            case .chatItemUpdated: return "chatItemUpdated"
+            case .chatItemDeleted: return "chatItemDeleted"
            case .cmdOk: return "cmdOk"
            case .chatCmdError: return "chatCmdError"
            case .chatError: return "chatError"
@@ -211,7 +224,9 @@ enum ChatResponse: Decodable, Error {
            case let .groupEmpty(groupInfo): return String(describing: groupInfo)
            case .userContactLinkSubscribed: return noDetails
            case let .newChatItem(chatItem): return String(describing: chatItem)
+            case let .chatItemStatusUpdated(chatItem): return String(describing: chatItem)
            case let .chatItemUpdated(chatItem): return String(describing: chatItem)
+            case let .chatItemDeleted(deletedChatItem, toChatItem): return "deletedChatItem:\n\(String(describing: deletedChatItem))\ntoChatItem:\n\(String(describing: toChatItem))"
            case .cmdOk: return noDetails
            case let .chatCmdError(chatError): return String(describing: chatError)
            case let .chatError(chatError): return String(describing: chatError)
@@ -356,15 +371,20 @@ func apiGetChats() throws -> [Chat] {
    throw r
 }

-func apiGetChat(type: ChatType, id: Int64) async throws -> Chat {
-    let r = await chatSendCmd(.apiGetChat(type: type, id: id))
+func apiGetChat(type: ChatType, id: Int64) throws -> Chat {
+    let r = chatSendCmdSync(.apiGetChat(type: type, id: id))
    if case let .apiChat(chat) = r { return Chat.init(chat) }
    throw r
 }

-func apiSendMessage(type: ChatType, id: Int64, msg: MsgContent) async throws -> ChatItem {
+func apiSendMessage(type: ChatType, id: Int64, quotedItemId: Int64?, msg: MsgContent) async throws -> ChatItem {
    let chatModel = ChatModel.shared
-    let cmd = ChatCommand.apiSendMessage(type: type, id: id, msg: msg)
+    let cmd: ChatCommand
+    if let itemId = quotedItemId {
+        cmd = .apiSendMessageQuote(type: type, id: id, itemId: itemId, msg: msg)
+    } else {
+        cmd = .apiSendMessage(type: type, id: id, msg: msg)
+    }
    let r: ChatResponse
    if type == .direct {
        var cItem: ChatItem!
@@ -385,6 +405,18 @@ func apiSendMessage(type: ChatType, id: Int64, msg: MsgContent) async throws ->
    throw r
 }

+func apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent) async throws -> ChatItem {
+    let r = await chatSendCmd(.apiUpdateChatItem(type: type, id: id, itemId: itemId, msg: msg), bgDelay: msgDelay)
+    if case let .chatItemUpdated(aChatItem) = r { return aChatItem.chatItem }
+    throw r
+}
+
+func apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode) async throws -> ChatItem {
+    let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemId: itemId, mode: mode), bgDelay: msgDelay)
+    if case let .chatItemDeleted(_, toChatItem) = r { return toChatItem.chatItem }
+    throw r
+}
+
 func getUserSMPServers() throws -> [String] {
    let r = chatSendCmdSync(.getUserSMPServers)
    if case let .userSMPServers(smpServers) = r { return smpServers }
@@ -419,7 +451,7 @@ func apiDeleteChat(type: ChatType, id: Int64) async throws {
 }

 func apiUpdateProfile(profile: Profile) async throws -> Profile? {
-    let r = await chatSendCmd(.updateProfile(profile: profile))
+    let r = await chatSendCmd(.apiUpdateProfile(profile: profile))
    switch r {
    case .userProfileNoChange: return nil
    case let .userProfileUpdated(_, toProfile): return toProfile
@@ -593,10 +625,14 @@ func processReceivedMsg(_ res: ChatResponse) {
            let cItem = aChatItem.chatItem
            chatModel.addChatItem(cInfo, cItem)
            NtfManager.shared.notifyMessageReceived(cInfo, cItem)
-        case let .chatItemUpdated(aChatItem):
+        case let .chatItemStatusUpdated(aChatItem):
            let cInfo = aChatItem.chatInfo
            let cItem = aChatItem.chatItem
-            if chatModel.upsertChatItem(cInfo, cItem) {
+            var res = false
+            if !cItem.isDeletedContent() {
+                res = chatModel.upsertChatItem(cInfo, cItem)
+            }
+            if res {
                NtfManager.shared.notifyMessageReceived(cInfo, cItem)
            } else if let endTask = chatModel.messageDelivery[cItem.id] {
                switch cItem.meta.itemStatus {
@@ -606,6 +642,21 @@ func processReceivedMsg(_ res: ChatResponse) {
                default: break
                }
            }
+        case let .chatItemUpdated(aChatItem):
+            let cInfo = aChatItem.chatInfo
+            let cItem = aChatItem.chatItem
+            if chatModel.upsertChatItem(cInfo, cItem) {
+                NtfManager.shared.notifyMessageReceived(cInfo, cItem)
+            }
+        case let .chatItemDeleted(_, toChatItem):
+            let cInfo = toChatItem.chatInfo
+            let cItem = toChatItem.chatItem
+            if cItem.meta.itemDeleted {
+                chatModel.removeChatItem(cInfo, cItem)
+            } else {
+                // currently only broadcast deletion of rcv message can be received, and only this case should happen
+                _ = chatModel.upsertChatItem(cInfo, cItem)
+            }
        default:
            logger.debug("unsupported event: \(res.responseType)")
        }
@@ -695,10 +746,13 @@ private func getJSONObject(_ cjson: UnsafePointer<CChar>) -> NSDictionary? {
    return try? JSONSerialization.jsonObject(with: d) as? NSDictionary
 }

-private func encodeCJSON<T: Encodable>(_ value: T) -> [CChar] {
+private func encodeJSON<T: Encodable>(_ value: T) -> String {
    let data = try! jsonEncoder.encode(value)
-    let str = String(decoding: data, as: UTF8.self)
-    return str.cString(using: .utf8)!
+    return String(decoding: data, as: UTF8.self)
+}
+
+private func encodeCJSON<T: Encodable>(_ value: T) -> [CChar] {
+    encodeJSON(value).cString(using: .utf8)!
 }

 enum ChatError: Decodable {
@@ -734,6 +788,9 @@ enum ChatErrorType: Decodable {
    case fileSend(fileId: Int64, agentError: String)
    case fileRcvChunk(message: String)
    case fileInternal(message: String)
+    case invalidQuote
+    case invalidChatItemUpdate
+    case invalidChatItemDelete
    case agentVersion
    case commandError(message: String)
 }
@@ -765,6 +822,8 @@ enum StoreError: Decodable {
    case noMsgDelivery(connId: Int64, agentMsgId: String)
    case badChatItem(itemId: Int64)
    case chatItemNotFound(itemId: Int64)
+    case quotedChatItemNotFound
+    case chatItemSharedMsgIdNotFound(sharedMsgId: String)
 }

 enum AgentErrorType: Decodable {
@@ -13,16 +13,22 @@ struct CIMetaView: View {

    var body: some View {
        HStack(alignment: .center, spacing: 4) {
-            switch chatItem.meta.itemStatus {
-            case .sndSent:
-                statusImage("checkmark", .secondary)
-            case .sndErrorAuth:
-                statusImage("multiply", .red)
-            case .sndError:
-                statusImage("exclamationmark.triangle.fill", .yellow)
-            case .rcvNew:
-                statusImage("circlebadge.fill", Color.accentColor)
-            default: EmptyView()
+            if !chatItem.isDeletedContent() {
+                if chatItem.meta.itemEdited {
+                    statusImage("pencil", .secondary, 9)
+                }
+
+                switch chatItem.meta.itemStatus {
+                case .sndSent:
+                    statusImage("checkmark", .secondary)
+                case .sndErrorAuth:
+                    statusImage("multiply", .red)
+                case .sndError:
+                    statusImage("exclamationmark.triangle.fill", .yellow)
+                case .rcvNew:
+                    statusImage("circlebadge.fill", Color.accentColor)
+                default: EmptyView()
+                }
            }

            chatItem.timestampText
@@ -31,17 +37,22 @@ struct CIMetaView: View {
        }
    }

-    private func statusImage(_ systemName: String, _ color: Color) -> some View {
+    private func statusImage(_ systemName: String, _ color: Color, _ maxHeight: CGFloat = 8) -> some View {
        Image(systemName: systemName)
            .resizable()
            .aspectRatio(contentMode: .fit)
            .foregroundColor(color)
-            .frame(maxHeight: 8)
+            .frame(maxHeight: maxHeight)
    }
 }

 struct CIMetaView_Previews: PreviewProvider {
    static var previews: some View {
-        CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent))
+        return Group {
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, false, true))
+            CIMetaView(chatItem: ChatItem.getDeletedContentSample())
+        }
+        .previewLayout(.fixed(width: 360, height: 100))
    }
 }
@@ -0,0 +1,51 @@
+//
+//  FramedItemView.swift
+//  SimpleX
+//
+//  Created by JRoberts on 04/02/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct DeletedItemView: View {
+    @Environment(\.colorScheme) var colorScheme
+    var chatItem: ChatItem
+    var showMember = false
+
+    var body: some View {
+        HStack(alignment: .bottom, spacing: 0) {
+            if showMember, let member = chatItem.memberDisplayName {
+                Text(member).fontWeight(.medium) + Text(": ")
+            }
+            Text(chatItem.content.text)
+                .foregroundColor(.secondary)
+                .italic()
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+        }
+        .padding(.leading, 12)
+        .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
+        .textSelection(.disabled)
+//        .background(Color(uiColor: .systemBackground))
+//        .overlay(
+//            RoundedRectangle(cornerRadius: 18)
+//                .stroke(.quaternary, lineWidth: 1)
+//        )
+    }
+}
+
+struct DeletedItemView_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
+            DeletedItemView(
+                chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)),
+                showMember: true
+            )
+        }
+        .previewLayout(.fixed(width: 360, height: 200))
+    }
+}
@@ -12,25 +12,22 @@ struct EmojiItemView: View {
    var chatItem: ChatItem

    var body: some View {
-        let sent = chatItem.chatDir.sent
-        let s = chatItem.content.text.trimmingCharacters(in: .whitespaces)
-
        VStack(spacing: 1) {
-            Text(s)
-                .font(s.count < 4 ? largeEmojiFont : mediumEmojiFont)
+            emojiText(chatItem.content.text)
                .padding(.top, 8)
                .padding(.horizontal, 6)
-                .frame(maxWidth: .infinity, alignment: sent ? .trailing : .leading)
            CIMetaView(chatItem: chatItem)
                .padding(.bottom, 8)
                .padding(.horizontal, 12)
-                .frame(maxWidth: .infinity, alignment: sent ? .trailing : .leading)
        }
-        .padding(.horizontal)
-        .frame(maxWidth: .infinity, alignment: sent ? .trailing : .leading)
    }
 }

+func emojiText(_ text: String) -> Text {
+    let s = text.trimmingCharacters(in: .whitespaces)
+    return Text(s).font(s.count < 4 ? largeEmojiFont : mediumEmojiFont)
+}
+
 struct EmojiItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
@@ -0,0 +1,131 @@
+//
+//  FramedItemView.swift
+//  SimpleX
+//
+//  Created by Evgeny Poberezkin on 04/02/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+private let sentColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.12)
+private let sentColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.17)
+private let sentQuoteColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.11)
+private let sentQuoteColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.09)
+
+struct FramedItemView: View {
+    @Environment(\.colorScheme) var colorScheme
+    var chatItem: ChatItem
+    var showMember = false
+    @State var msgWidth: CGFloat = 0
+
+    var body: some View {
+        let v = ZStack(alignment: .bottomTrailing) {
+            VStack(alignment: .leading, spacing: 0) {
+                if let qi = chatItem.quotedItem {
+                    MsgContentView(
+                        content: qi,
+                        sender: qi.sender
+                    )
+                    .lineLimit(3)
+                    .font(.subheadline)
+                    .padding(.vertical, 6)
+                    .padding(.horizontal, 12)
+                    .frame(minWidth: msgWidth, alignment: .leading)
+                    .background(
+                        chatItem.chatDir.sent
+                        ? (colorScheme == .light ? sentQuoteColorLight : sentQuoteColorDark)
+                        : Color(uiColor: .quaternarySystemFill)
+                    )
+                    .overlay(DetermineWidth())
+                }
+
+                if chatItem.formattedText == nil && isShortEmoji(chatItem.content.text) {
+                    VStack {
+                        emojiText(chatItem.content.text)
+                        Text("")
+                    }
+                    .padding(.vertical, 6)
+                    .padding(.horizontal, 12)
+                    .overlay(DetermineWidth())
+                    .frame(minWidth: msgWidth, alignment: .center)
+                    .padding(.bottom, 2)
+                } else {
+                    MsgContentView(
+                        content: chatItem.content,
+                        formattedText: chatItem.formattedText,
+                        sender: showMember ? chatItem.memberDisplayName : nil,
+                        metaText: chatItem.timestampText,
+                        edited: chatItem.meta.itemEdited
+                    )
+                    .padding(.vertical, 6)
+                    .padding(.horizontal, 12)
+                    .overlay(DetermineWidth())
+                    .frame(minWidth: 0, alignment: .leading)
+                    .textSelection(.enabled)
+                }
+            }
+            
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+                .padding(.bottom, 6)
+                .overlay(DetermineWidth())
+        }
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
+        .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
+
+        switch chatItem.meta.itemStatus {
+        case .sndErrorAuth:
+            v.onTapGesture { msgDeliveryError("Most likely this contact has deleted the connection with you.") }
+        case let .sndError(agentError):
+            v.onTapGesture { msgDeliveryError("Unexpected error: \(String(describing: agentError))") }
+        default: v
+        }
+    }
+
+    private func msgDeliveryError(_ err: String) {
+        AlertManager.shared.showAlertMsg(
+            title: "Message delivery error",
+            message: err
+        )
+    }
+}
+
+func chatItemFrameColor(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+    ci.chatDir.sent
+    ? (colorScheme == .light ? sentColorLight : sentColorDark)
+    : Color(uiColor: .tertiarySystemGroupedBackground)
+}
+
+struct FramedItemView_Previews: PreviewProvider {
+    static var previews: some View {
+        Group{
+            FramedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
+            FramedItemView(chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd)))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat"))
+        }
+        .previewLayout(.fixed(width: 360, height: 200))
+    }
+}
+
+struct FramedItemViewEdited_Previews: PreviewProvider {
+    static var previews: some View {
+        Group{
+            FramedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, false, true))
+            FramedItemView(chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), false, true))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), false, true))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), false, true))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, false, true))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, false, true))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, false, true))
+            FramedItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat", .rcvRead, false, true))
+        }
+        .previewLayout(.fixed(width: 360, height: 200))
+    }
+}
@@ -0,0 +1,99 @@
+//
+//  MsgContentView.swift
+//  SimpleX
+//
+//  Created by Evgeny on 13/03/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+private let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
+private let linkColor = Color(uiColor: uiLinkColor)
+
+struct MsgContentView: View {
+    var content: ItemContent
+    var formattedText: [FormattedText]? = nil
+    var sender: String? = nil
+    var metaText: Text? = nil
+    var edited = false
+
+    var body: some View {
+        let v = messageText(content, formattedText, sender)
+        if let mt = metaText {
+            return v + reserveSpaceForMeta(mt, edited)
+        } else {
+            return v
+        }
+    }
+    
+    private func reserveSpaceForMeta(_ meta: Text, _ edited: Bool) -> Text {
+        let reserve = edited ? "          " : "      "
+        return (Text(reserve) + meta)
+            .font(.caption)
+            .foregroundColor(.clear)
+    }
+}
+
+func messageText(_ content: ItemContent, _ formattedText: [FormattedText]?, _ sender: String?, preview: Bool = false) -> Text {
+    let s = content.text
+    var res: Text
+    if let ft = formattedText, ft.count > 0 {
+        res = formattText(ft[0], preview)
+        var i = 1
+        while i < ft.count {
+            res = res + formattText(ft[i], preview)
+            i = i + 1
+        }
+    } else {
+        res = Text(s)
+    }
+
+    if let s = sender {
+        let t = Text(s)
+        return (preview ? t : t.fontWeight(.medium)) + Text(": ") + res
+    } else {
+        return res
+    }
+}
+
+private func formattText(_ ft: FormattedText, _ preview: Bool) -> Text {
+    let t = ft.text
+    if let f = ft.format {
+        switch (f) {
+        case .bold: return Text(t).bold()
+        case .italic: return Text(t).italic()
+        case .strikeThrough: return Text(t).strikethrough()
+        case .snippet: return Text(t).font(.body.monospaced())
+        case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
+        case let .colored(color): return Text(t).foregroundColor(color.uiColor)
+        case .uri: return linkText(t, t, preview, prefix: "")
+        case .email: return linkText(t, t, preview, prefix: "mailto:")
+        case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
+        }
+    } else {
+        return Text(t)
+    }
+}
+
+private func linkText(_ s: String, _ link: String,
+                      _ preview: Bool, prefix: String) -> Text {
+    preview
+    ? Text(s).foregroundColor(linkColor).underline(color: linkColor)
+    : Text(AttributedString(s, attributes: AttributeContainer([
+        .link: NSURL(string: prefix + link) as Any,
+        .foregroundColor: uiLinkColor as Any
+    ]))).underline()
+}
+
+struct MsgContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        let chatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
+        return MsgContentView(
+            content: chatItem.content,
+            formattedText: chatItem.formattedText,
+            sender: chatItem.memberDisplayName,
+            metaText: chatItem.timestampText
+        )
+    }
+}
@@ -1,136 +0,0 @@
-//
-//  TextItemView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 04/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-private let sentColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.12)
-private let sentColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.17)
-private let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
-private let linkColor = Color(uiColor: uiLinkColor)
-
-struct TextItemView: View {
-    @Environment(\.colorScheme) var colorScheme
-    var chatItem: ChatItem
-    var width: CGFloat
-    private let codeFont = Font.custom("Courier", size: UIFont.preferredFont(forTextStyle: .body).pointSize)
-
-    var body: some View {
-        let sent = chatItem.chatDir.sent
-        let maxWidth = width * 0.78
-
-        return ZStack(alignment: .bottomTrailing) {
-            (messageText(chatItem) + reserveSpaceForMeta(chatItem.timestampText))
-                .padding(.vertical, 6)
-                .padding(.horizontal, 12)
-                .frame(minWidth: 0, alignment: .leading)
-                .textSelection(.enabled)
-
-            CIMetaView(chatItem: chatItem)
-                .padding(.trailing, 12)
-                .padding(.bottom, 6)
-        }
-        .background(
-            sent
-            ? (colorScheme == .light ? sentColorLight : sentColorDark)
-            : Color(uiColor: .tertiarySystemGroupedBackground)
-        )
-        .cornerRadius(18)
-        .padding(.horizontal)
-        .frame(
-            maxWidth: maxWidth,
-            maxHeight: .infinity,
-            alignment: sent ? .trailing : .leading
-        )
-        .onTapGesture {
-            switch chatItem.meta.itemStatus {
-            case .sndErrorAuth: msgDeliveryError("Most likely this contact has deleted the connection with you.")
-            case let .sndError(agentError): msgDeliveryError("Unexpected error: \(String(describing: agentError))")
-            default: return
-            }
-        }
-    }
-
-    private func reserveSpaceForMeta(_ meta: Text) -> Text {
-       (Text("      ") + meta)
-           .font(.caption)
-           .foregroundColor(.clear)
-    }
-
-    private func msgDeliveryError(_ err: String) {
-        AlertManager.shared.showAlertMsg(
-            title: "Message delivery error",
-            message: err
-        )
-    }
-}
-
-func messageText(_ chatItem: ChatItem, preview: Bool = false) -> Text {
-    let s = chatItem.content.text
-    var res: Text
-    if let ft = chatItem.formattedText, ft.count > 0 {
-        res = formattedText(ft[0], preview)
-        var i = 1
-        while i < ft.count {
-            res = res + formattedText(ft[i], preview)
-            i = i + 1
-        }
-    } else {
-        res = Text(s)
-    }
-
-    if case let .groupRcv(groupMember) = chatItem.chatDir {
-        let m = Text(groupMember.memberProfile.displayName)
-        return (preview ? m : m.font(.headline)) + Text(": ") + res
-    } else {
-        return res
-    }
-}
-
-private func formattedText(_ ft: FormattedText, _ preview: Bool) -> Text {
-    let t = ft.text
-    if let f = ft.format {
-        switch (f) {
-        case .bold: return Text(t).bold()
-        case .italic: return Text(t).italic()
-        case .strikeThrough: return Text(t).strikethrough()
-        case .snippet: return Text(t).font(.body.monospaced())
-        case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
-        case let .colored(color): return Text(t).foregroundColor(color.uiColor)
-        case .uri: return linkText(t, t, preview, prefix: "")
-        case .email: return linkText(t, t, preview, prefix: "mailto:")
-        case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
-        }
-    } else {
-        return Text(t)
-    }
-}
-
-private func linkText(_ s: String, _ link: String,
-                      _ preview: Bool, prefix: String) -> Text {
-    preview
-    ? Text(s).foregroundColor(linkColor).underline(color: linkColor)
-    : Text(AttributedString(s, attributes: AttributeContainer([
-        .link: NSURL(string: prefix + link) as Any,
-        .foregroundColor: uiLinkColor as Any
-    ]))).underline()
-}
-
-struct TextItemView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group{
-            TextItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat"), width: 360)
-        }
-        .previewLayout(.fixed(width: 360, height: 70))
-    }
-}
@@ -10,13 +10,17 @@ import SwiftUI

 struct ChatItemView: View {
    var chatItem: ChatItem
-    var width: CGFloat
+    var showMember = false

    var body: some View {
-        if (isShortEmoji(chatItem.content.text)) {
-            EmojiItemView(chatItem: chatItem)
-        } else {
-            TextItemView(chatItem: chatItem, width: width)
+        if chatItem.isMsgContent() {
+            if (chatItem.quotedItem == nil && isShortEmoji(chatItem.content.text)) {
+                EmojiItemView(chatItem: chatItem)
+            } else {
+                FramedItemView(chatItem: chatItem, showMember: showMember)
+            }
+        } else if chatItem.isDeletedContent() {
+            DeletedItemView(chatItem: chatItem, showMember: showMember)
        }
    }
 }
@@ -24,11 +28,12 @@ struct ChatItemView: View {
 struct ChatItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), width: 360)
+            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
+            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"))
+            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
+            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"))
+            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"))
+            ChatItemView(chatItem: ChatItem.getDeletedContentSample())
        }
        .previewLayout(.fixed(width: 360, height: 70))
    }
@@ -8,25 +8,52 @@

 import SwiftUI

+private let memberImageSize: CGFloat = 34
+
 struct ChatView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.colorScheme) var colorScheme
    @ObservedObject var chat: Chat
+    @State var message: String = ""
+    @State var quotedItem: ChatItem? = nil
+    @State var editingItem: ChatItem? = nil
+    @State var deletingItem: ChatItem? = nil
    @State private var inProgress: Bool = false
    @FocusState private var keyboardVisible: Bool
    @State private var showChatInfo = false
+    @State private var showDeleteMessage = false

    var body: some View {
        let cInfo = chat.chatInfo

        return VStack {
            GeometryReader { g in
+                let maxWidth =
+                    cInfo.chatType == .group
+                    ? (g.size.width - 28) * 0.84 - 42
+                    : (g.size.width - 32) * 0.84
                ScrollViewReader { proxy in
                    ScrollView {
-                        VStack(spacing: 5)  {
-                            ForEach(chatModel.chatItems, id: \.id) {
-                                ChatItemView(chatItem: $0, width: g.size.width)
-                                    .frame(minWidth: 0, maxWidth: .infinity, alignment: $0.chatDir.sent ? .trailing : .leading)
+                        LazyVStack(spacing: 5)  {
+                            ForEach(chatModel.chatItems) { ci in
+                                if case let .groupRcv(member) = ci.chatDir {
+                                    let prevItem = chatModel.getPrevChatItem(ci)
+                                    HStack(alignment: .top, spacing: 0) {
+                                        let showMember = prevItem == nil || showMemberImage(member, prevItem)
+                                        if showMember {
+                                            ProfileImage(imageStr: member.memberProfile.image)
+                                                .frame(width: memberImageSize, height: memberImageSize)
+                                        } else {
+                                            Rectangle().fill(.clear)
+                                                .frame(width: memberImageSize, height: memberImageSize)
+                                        }
+                                        chatItemWithMenu(ci, maxWidth, showMember: showMember).padding(.leading, 8)
+                                    }
+                                    .padding(.trailing)
+                                    .padding(.leading, 12)
+                                } else {
+                                    chatItemWithMenu(ci, maxWidth).padding(.horizontal)
+                                }
                            }
                            .onAppear {
                                DispatchQueue.main.async {
@@ -54,8 +81,12 @@ struct ChatView: View {

            Spacer(minLength: 0)

-            SendMessageView(
+            ComposeView(
+                message: $message,
+                quotedItem: $quotedItem,
+                editingItem: $editingItem,
                sendMessage: sendMessage,
+                resetMessage: { message = "" },
                inProgress: inProgress,
                keyboardVisible: $keyboardVisible
            )
@@ -85,6 +116,63 @@ struct ChatView: View {
        .navigationBarBackButtonHidden(true)
    }

+    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat, showMember: Bool = false) -> some View {
+        let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
+        return ChatItemView(chatItem: ci, showMember: showMember)
+            .contextMenu {
+                if ci.isMsgContent() {
+                    Button {
+                        withAnimation {
+                            editingItem = nil
+                            quotedItem = ci
+                        }
+                    } label: { Label("Reply", systemImage: "arrowshape.turn.up.left") }
+                    Button {
+                        showShareSheet(items: [ci.content.text])
+                    } label: { Label("Share", systemImage: "square.and.arrow.up") }
+                    Button {
+                        UIPasteboard.general.string = ci.content.text
+                    } label: { Label("Copy", systemImage: "doc.on.doc") }
+                    if ci.meta.editable {
+                        Button {
+                            withAnimation {
+                                quotedItem = nil
+                                editingItem = ci
+                                message = ci.content.text
+                            }
+                        } label: { Label("Edit", systemImage: "square.and.pencil") }
+                    }
+                    Button(role: .destructive) {
+                        showDeleteMessage = true
+                        deletingItem = ci
+                    } label: {
+                        Label("Delete", systemImage: "trash")
+                    }
+                }
+            }
+            .confirmationDialog("Delete message?", isPresented: $showDeleteMessage, titleVisibility: .visible) {
+                Button("Delete for me", role: .destructive) {
+                    deleteMessage(.cidmInternal)
+                }
+                if let di = deletingItem {
+                    if di.meta.editable {
+                        Button("Delete for everyone",role: .destructive) { deleteMessage(.cidmBroadcast)
+                        }
+                    }
+                }
+            }
+            .frame(maxWidth: maxWidth, maxHeight: .infinity, alignment: alignment)
+            .frame(minWidth: 0, maxWidth: .infinity, alignment: alignment)
+    }
+    
+    private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
+        switch (prevItem?.chatDir) {
+        case .groupSnd: return true
+        case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
+        default: return false
+        }
+    }
+
    func scrollToBottom(_ proxy: ScrollViewProxy, animation: Animation = .default) {
        withAnimation(animation) { scrollToBottom_(proxy) }
    }
@@ -113,14 +201,58 @@ struct ChatView: View {
    }

    func sendMessage(_ msg: String) {
+        logger.debug("ChatView sendMessage")
        Task {
+            logger.debug("ChatView sendMessage: in Task")
            do {
-                let chatItem = try await apiSendMessage(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, msg: .text(msg))
-                DispatchQueue.main.async {
-                    chatModel.addChatItem(chat.chatInfo, chatItem)
+                if let ei = editingItem {
+                    let chatItem = try await apiUpdateChatItem(
+                        type: chat.chatInfo.chatType,
+                        id: chat.chatInfo.apiId,
+                        itemId: ei.id,
+                        msg: .text(msg)
+                    )
+                    DispatchQueue.main.async {
+                        editingItem = nil
+                        let _ = chatModel.upsertChatItem(chat.chatInfo, chatItem)
+                    }
+                } else {
+                    let chatItem = try await apiSendMessage(
+                        type: chat.chatInfo.chatType,
+                        id: chat.chatInfo.apiId,
+                        quotedItemId: quotedItem?.meta.itemId,
+                        msg: .text(msg)
+                    )
+                    DispatchQueue.main.async {
+                        quotedItem = nil
+                        chatModel.addChatItem(chat.chatInfo, chatItem)
+                    }
                }
            } catch {
-                logger.error("ChatView.sendMessage apiSendMessage error: \(error.localizedDescription)")
+                logger.error("ChatView.sendMessage error: \(error.localizedDescription)")
+            }
+        }
+    }
+    
+    func deleteMessage(_ mode: CIDeleteMode) {
+        logger.debug("ChatView deleteMessage")
+        Task {
+            logger.debug("ChatView deleteMessage: in Task")
+            do {
+                if let di = deletingItem {
+                    let toItem = try await apiDeleteChatItem(
+                        type: chat.chatInfo.chatType,
+                        id: chat.chatInfo.apiId,
+                        itemId: di.id,
+                        mode: mode
+                    )
+                    DispatchQueue.main.async {
+                        deletingItem = nil
+                        let _ = chatModel.removeChatItem(chat.chatInfo, toItem)
+                    }
+                }
+            } catch {
+                logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
            }
        }
    }
@@ -134,11 +266,12 @@ struct ChatView_Previews: PreviewProvider {
            ChatItem.getSample(1, .directSnd, .now, "hello"),
            ChatItem.getSample(2, .directRcv, .now, "hi"),
            ChatItem.getSample(3, .directRcv, .now, "hi there"),
-            ChatItem.getSample(4, .directRcv, .now, "hello again"),
-            ChatItem.getSample(5, .directSnd, .now, "hi there!!!"),
-            ChatItem.getSample(6, .directSnd, .now, "how are you?"),
-            ChatItem.getSample(7, .directSnd, .now, "👍👍👍👍"),
-            ChatItem.getSample(8, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+            ChatItem.getDeletedContentSample(4),
+            ChatItem.getSample(5, .directRcv, .now, "hello again"),
+            ChatItem.getSample(6, .directSnd, .now, "hi there!!!"),
+            ChatItem.getSample(7, .directSnd, .now, "how are you?"),
+            ChatItem.getSample(8, .directSnd, .now, "👍👍👍👍"),
+            ChatItem.getSample(9, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
        ]
        return ChatView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
            .environmentObject(chatModel)
@@ -0,0 +1,76 @@
+//
+//  ComposeView.swift
+//  SimpleX
+//
+//  Created by Evgeny on 13/03/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+// TODO
+//enum ComposeState {
+//    case plain
+//    case quoted(quotedItem: ChatItem)
+//    case editing(editingItem: ChatItem)
+//}
+
+struct ComposeView: View {
+    @Binding var message: String
+    @Binding var quotedItem: ChatItem?
+    @Binding var editingItem: ChatItem?
+    var sendMessage: (String) -> Void
+    var resetMessage: () -> Void
+    var inProgress: Bool = false
+    @FocusState.Binding var keyboardVisible: Bool
+    @State var editing: Bool = false
+
+    var body: some View {
+        VStack(spacing: 0) {
+            if (quotedItem != nil) {
+                ContextItemView(contextItem: $quotedItem, editing: $editing)
+            } else if (editingItem != nil) {
+                ContextItemView(contextItem: $editingItem, editing: $editing, resetMessage: resetMessage)
+            }
+            SendMessageView(
+                sendMessage: sendMessage,
+                inProgress: inProgress,
+                message: $message,
+                keyboardVisible: $keyboardVisible,
+                editing: $editing
+            )
+            .background(.background)
+        }
+        .onChange(of: editingItem == nil) { _ in
+            editing = (editingItem != nil)
+        }
+    }
+}
+
+struct ComposeView_Previews: PreviewProvider {
+    static var previews: some View {
+        @State var message: String = ""
+        @FocusState var keyboardVisible: Bool
+        @State var item: ChatItem? = ChatItem.getSample(1, .directSnd, .now, "hello")
+        @State var nilItem: ChatItem? = nil
+
+        return Group {
+            ComposeView(
+                message: $message,
+                quotedItem: $item,
+                editingItem: $nilItem,
+                sendMessage: { print ($0) },
+                resetMessage: {},
+                keyboardVisible: $keyboardVisible
+            )
+            ComposeView(
+                message: $message,
+                quotedItem: $nilItem,
+                editingItem: $item,
+                sendMessage: { print ($0) },
+                resetMessage: {},
+                keyboardVisible: $keyboardVisible
+            )
+        }
+    }
+}
@@ -0,0 +1,55 @@
+//
+//  ContextItemView.swift
+//  SimpleX
+//
+//  Created by JRoberts on 13/03/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct ContextItemView: View {
+    @Environment(\.colorScheme) var colorScheme
+    @Binding var contextItem: ChatItem?
+    @Binding var editing: Bool
+    var resetMessage: () -> Void = {}
+
+    var body: some View {
+        if let cxtItem = contextItem {
+            HStack {
+                contextText(cxtItem).lineLimit(3)
+                Spacer()
+                Button {
+                    withAnimation {
+                        contextItem = nil
+                        if editing { resetMessage() }
+                    }
+                } label: {
+                    Image(systemName: "multiply")
+                }
+            }
+            .padding(12)
+            .frame(maxWidth: .infinity)
+            .background(chatItemFrameColor(cxtItem, colorScheme))
+            .padding(.top, 8)
+        } else {
+            EmptyView()
+        }
+    }
+    
+    func contextText(_ cxtItem: ChatItem) -> some View {
+        if let s = cxtItem.memberDisplayName {
+            return (Text(s).fontWeight(.medium) + Text(": \(cxtItem.content.text)"))
+        } else {
+            return Text(cxtItem.content.text)
+        }
+    }
+}
+
+struct ContextItemView_Previews: PreviewProvider {
+    static var previews: some View {
+        @State var contextItem: ChatItem? = ChatItem.getSample(1, .directSnd, .now, "hello")
+        @State var editing: Bool = false
+        return ContextItemView(contextItem: $contextItem, editing: $editing)
+    }
+}
@@ -11,9 +11,10 @@ import SwiftUI
 struct SendMessageView: View {
    var sendMessage: (String) -> Void
    var inProgress: Bool = false
-    @State private var message: String = "" //Lorem ipsum dolor sit amet, consectetur" // adipiscing elit, sed do eiusmod tempor incididunt ut labor7 et dolore magna aliqua. Ut enim ad minim veniam, quis"// nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."// Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+    @Binding var message: String //Lorem ipsum dolor sit amet, consectetur" // adipiscing elit, sed do eiusmod tempor incididunt ut labor7 et dolore magna aliqua. Ut enim ad minim veniam, quis"// nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."// Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
    @Namespace var namespace
    @FocusState.Binding var keyboardVisible: Bool
+    @Binding var editing: Bool
    @State private var teHeight: CGFloat = 42
    @State private var teFont: Font = .body
    var maxHeight: CGFloat = 360
@@ -47,7 +48,7 @@ struct SendMessageView: View {
                        .padding([.bottom, .trailing], 3)
                } else {
                    Button(action: submit) {
-                        Image(systemName: "arrow.up.circle.fill")
+                        Image(systemName: editing ? "checkmark.circle.fill" : "arrow.up.circle.fill")
                            .resizable()
                            .foregroundColor(.accentColor)
                    }
@@ -85,15 +86,34 @@ struct SendMessageView: View {

 struct SendMessageView_Previews: PreviewProvider {
    static var previews: some View {
+        @State var message: String = ""
        @FocusState var keyboardVisible: Bool
+        @State var editingOff: Bool = false
+        @State var editingOn: Bool = true
+        @State var item: ChatItem? = ChatItem.getSample(1, .directSnd, .now, "hello")
+        @State var nilItem: ChatItem? = nil

-        return VStack {
-            Text("")
-            Spacer(minLength: 0)
-            SendMessageView(
-                sendMessage: { print ($0) },
-                keyboardVisible: $keyboardVisible
-            )
+        return Group {
+            VStack {
+                Text("")
+                Spacer(minLength: 0)
+                SendMessageView(
+                    sendMessage: { print ($0) },
+                    message: $message,
+                    keyboardVisible: $keyboardVisible,
+                    editing: $editingOff
+                )
+            }
+            VStack {
+                Text("")
+                Spacer(minLength: 0)
+                SendMessageView(
+                    sendMessage: { print ($0) },
+                    message: $message,
+                    keyboardVisible: $keyboardVisible,
+                    editing: $editingOn
+                )
+            }
        }
    }
 }
@@ -18,7 +18,7 @@ struct ChatHelp: View {

            HStack(spacing: 4) {
                Text("You can")
-                Button("connect to SimpleX team.") {
+                Button("connect to SimpleX Chat founder.") {
                    showSettings = false
                    DispatchQueue.main.async {
                        UIApplication.shared.open(simplexTeamURL)
@@ -27,17 +27,13 @@ struct ChatListNavLink: View {
    private func chatView() -> some View {
        ChatView(chat: chat)
        .onAppear {
-            Task {
-                do {
-                    let cInfo = chat.chatInfo
-                    let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId)
-                    DispatchQueue.main.async {
-                        chatModel.updateChatInfo(chat.chatInfo)
-                        chatModel.chatItems = chat.chatItems
-                    }
-                } catch {
-                    logger.error("ChatListNavLink.chatView apiGetChatItems error: \(error.localizedDescription)")
-                }
+            do {
+                let cInfo = chat.chatInfo
+                let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId)
+                chatModel.updateChatInfo(chat.chatInfo)
+                chatModel.chatItems = chat.chatItems
+            } catch {
+                logger.error("ChatListNavLink.chatView apiGetChatItems error: \(error.localizedDescription)")
            }
        }
    }
@@ -51,7 +51,7 @@ struct ChatPreviewView: View {

                if let cItem = cItem {
                    ZStack(alignment: .topTrailing) {
-                        (itemStatusMark(cItem) + messageText(cItem, preview: true))
+                        (itemStatusMark(cItem) + messageText(cItem.content, cItem.formattedText, cItem.memberDisplayName, preview: true))
                            .frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44, alignment: .topLeading)
                            .padding(.leading, 8)
                            .padding(.trailing, 36)
@@ -19,10 +19,11 @@ struct ChatInfoImage: View {
        case .group: iconName = "person.2.circle.fill"
        default: iconName = "circle.fill"
        }
-
-        return Image(systemName: iconName)
-            .resizable()
-            .foregroundColor(color)
+        return ProfileImage(
+            imageStr: chat.chatInfo.image,
+            iconName: iconName,
+            color: color
+        )
    }
 }

@@ -0,0 +1,35 @@
+//
+//  DetermineWidth.swift
+//  SimpleX
+//
+//  Created by Evgeny on 14/03/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct DetermineWidth: View {
+    typealias Key = MaximumWidthPreferenceKey
+    var body: some View {
+        GeometryReader { proxy in
+            Color.clear
+                .preference(
+                    key: MaximumWidthPreferenceKey.self,
+                    value: proxy.size.width
+                )
+        }
+    }
+}
+
+struct MaximumWidthPreferenceKey: PreferenceKey {
+    static var defaultValue: CGFloat = 0
+    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}
+
+struct DetermineWidth_Previews: PreviewProvider {
+    static var previews: some View {
+        DetermineWidth()
+    }
+}
@@ -0,0 +1,48 @@
+//
+//  ImagePicker.swift
+//  SimpleX
+//
+//  Created by Evgeny on 23/03/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct ImagePicker: UIViewControllerRepresentable {
+    @Environment(\.presentationMode) var presentationMode
+    var source: UIImagePickerController.SourceType
+    @Binding var image: UIImage?
+    
+    class Coordinator: NSObject, UINavigationControllerDelegate, UIImagePickerControllerDelegate {
+        let parent: ImagePicker
+        
+        init(_ parent: ImagePicker) {
+            self.parent = parent
+        }
+        
+        func imagePickerController(_ picker: UIImagePickerController,
+                                   didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+            if let uiImage = info[.originalImage] as? UIImage {
+                parent.image = uiImage
+            }
+            parent.presentationMode.wrappedValue.dismiss()
+        }
+    }
+    
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+    
+
+    func makeUIViewController(context: UIViewControllerRepresentableContext<ImagePicker>) -> UIImagePickerController {
+        let picker = UIImagePickerController()
+        picker.sourceType = source
+        picker.allowsEditing = false
+        picker.delegate = context.coordinator
+        return picker
+    }
+
+    func updateUIViewController(_ uiViewController: UIImagePickerController, context: UIViewControllerRepresentableContext<ImagePicker>) {
+   
+    }
+}
@@ -0,0 +1,45 @@
+//
+//  ProfileImage.swift
+//  SimpleX
+//
+//  Created by Evgeny on 23/03/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct ProfileImage: View {
+    var imageStr: String? = nil
+    var iconName: String = "person.crop.circle.fill"
+    var color = Color(uiColor: .tertiarySystemGroupedBackground)
+    
+    var body: some View {
+        if let image = imageStr,
+           let data = Data(base64Encoded: dropImagePrefix(image)),
+           let uiImage = UIImage(data: data) {
+            Image(uiImage: uiImage)
+                .resizable()
+                .clipShape(Circle())
+        } else {
+            Image(systemName: iconName)
+                .resizable()
+                .foregroundColor(color)
+        }
+    }
+
+    func dropPrefix(_ s: String, _ prefix: String) -> String {
+        s.hasPrefix(prefix) ? String(s.dropFirst(prefix.count)) : s
+    }
+
+    func dropImagePrefix(_ s: String) -> String {
+        dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
+    }
+}
+
+struct ProfileImage_Previews: PreviewProvider {
+    static var previews: some View {
+        ProfileImage(imageStr: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAKHGlDQ1BJQ0MgUHJvZmlsZQAASImFVgdUVNcWve9Nb7QZeu9NehtAem/Sq6gMQ28OQxWxgAQjEFFEREARNFQFg1KjiIhiIQgoYA9IEFBisCAq6OQNJNH4//r/zDpz9ttzz7n73ffWmg0A6QCDxYqD+QCIT0hmezlYywQEBsngngEYCAIy0AC6DGYSy8rDwxUg8Xf9d7wbAxC33tHgzvrP3/9nCISFJzEBgIIRTGey2MkILkawT1oyi4tnEUxjI6IQvMLFkauYqxjQQtewwuoaHy8bBNMBwJMZDHYkAERbhJdJZUYic4hhCNZOCItOQDB3vjkzioFwxLsIXhcRl5IOAImrRzs+fivCk7QRrIL0shAcwNUW+tX8yH/tFfrPXgxG5D84Pi6F+dc9ck+HHJ7g641UMSQlQATQBHEgBaQDGcACbLAVYaIRJhx5Dv+9j77aZ4OsZIFtSEc0iARRIBnpt/9qlvfqpGSQBhjImnCEcUU+NtxnujZy4fbqVEiU/wuXdQyA9S0cDqfzC+e2F4DzyLkSB79wyi0A8KoBcL2GmcJOXePQ3C8MIAJeQAOiQArIAxXuWwMMgSmwBHbAGbgDHxAINgMmojceUZUGMkEWyAX54AA4DMpAJTgJ6sAZ0ALawQVwGVwDt8AQGAUPwQSYBi/AAngHliEIwkEUiAqJQtKQIqQO6UJ0yByyg1whLygQCoEioQQoBcqE9kD5UBFUBlVB9dBPUCd0GboBDUP3oUloDnoNfYRRMBmmwZKwEqwF02Er2AX2gTfBkXAinAHnwPvhUrgaPg23wZfhW/AoPAG/gBdRAEVCCaFkURooOsoG5Y4KQkWg2KidqDxUCaoa1YTqQvWj7qAmUPOoD2gsmoqWQWugTdGOaF80E52I3okuQJeh69Bt6D70HfQkegH9GUPBSGDUMSYYJ0wAJhKThsnFlGBqMK2Yq5hRzDTmHRaLFcIqY42wjthAbAx2O7YAewzbjO3BDmOnsIs4HE4Up44zw7njGLhkXC7uKO407hJuBDeNe48n4aXxunh7fBA+AZ+NL8E34LvxI/gZ/DKBj6BIMCG4E8II2wiFhFOELsJtwjRhmchPVCaaEX2IMcQsYimxiXiV+Ij4hkQiyZGMSZ6kaNJuUinpLOk6aZL0gSxAViPbkIPJKeT95FpyD/k++Q2FQlGiWFKCKMmU/ZR6yhXKE8p7HiqPJo8TTxjPLp5ynjaeEZ6XvAReRV4r3s28GbwlvOd4b/PO8xH4lPhs+Bh8O/nK+Tr5xvkW+an8Ovzu/PH8BfwN/Df4ZwVwAkoCdgJhAjkCJwWuCExRUVR5qg2VSd1DPUW9Sp2mYWnKNCdaDC2fdoY2SFsQFBDUF/QTTBcsF7woOCGEElISchKKEyoUahEaE/ooLClsJRwuvE+4SXhEeElEXMRSJFwkT6RZZFTko6iMqJ1orOhB0XbRx2JoMTUxT7E0seNiV8XmxWnipuJM8TzxFvEHErCEmoSXxHaJkxIDEouSUpIOkizJo5JXJOelhKQspWKkiqW6peakqdLm0tHSxdKXpJ/LCMpYycTJlMr0ySzISsg6yqbIVskOyi7LKcv5ymXLNcs9lifK0+Uj5Ivle+UXFKQV3BQyFRoVHigSFOmKUYpHFPsVl5SUlfyV9iq1K80qiyg7KWcoNyo/UqGoWKgkqlSr3FXFqtJVY1WPqQ6pwWoGalFq5Wq31WF1Q/Vo9WPqw+sw64zXJayrXjeuQdaw0kjVaNSY1BTSdNXM1mzXfKmloBWkdVCrX+uztoF2nPYp7Yc6AjrOOtk6XTqvddV0mbrlunf1KHr2erv0OvRe6avrh+sf179nQDVwM9hr0GvwydDIkG3YZDhnpGAUYlRhNE6n0T3oBfTrxhhja+NdxheMP5gYmiSbtJj8YaphGmvaYDq7Xnl9+PpT66fM5MwYZlVmE+Yy5iHmJ8wnLGQtGBbVFk8t5S3DLGssZ6xUrWKsTlu9tNa2Zlu3Wi/ZmNjssOmxRdk62ObZDtoJ2Pnaldk9sZezj7RvtF9wMHDY7tDjiHF0cTzoOO4k6cR0qndacDZy3uHc50J28XYpc3nqqubKdu1yg92c3Q65PdqguCFhQ7s7cHdyP+T+2EPZI9HjZ0+sp4dnueczLx2vTK9+b6r3Fu8G73c+1j6FPg99VXxTfHv9eP2C/er9lvxt/Yv8JwK0AnYE3AoUC4wO7AjCBfkF1QQtbrTbeHjjdLBBcG7w2CblTembbmwW2xy3+eIW3i2MLedCMCH+IQ0hKwx3RjVjMdQptCJ0gWnDPMJ8EWYZVhw2F24WXhQ+E2EWURQxG2kWeShyLsoiqiRqPtomuiz6VYxjTGXMUqx7bG0sJ84/rjkeHx8S35kgkBCb0LdVamv61mGWOiuXNZFokng4cYHtwq5JgpI2JXUk05A/0oEUlZTvUiZTzVPLU9+n+aWdS+dPT0gf2Ka2bd+2mQz7jB+3o7czt/dmymZmZU7usNpRtRPaGbqzd5f8rpxd07sddtdlEbNis37J1s4uyn67x39PV45kzu6cqe8cvmvM5cll547vNd1b+T36++jvB/fp7Tu673NeWN7NfO38kvyVAmbBzR90fij9gbM/Yv9goWHh8QPYAwkHxg5aHKwr4i/KKJo65HaorVimOK/47eEth2+U6JdUHiEeSTkyUepa2nFU4eiBoytlUWWj5dblzRUSFfsqlo6FHRs5bnm8qVKyMr/y44noE/eqHKraqpWqS05iT6aefHbK71T/j/Qf62vEavJrPtUm1E7UedX11RvV1zdINBQ2wo0pjXOng08PnbE909Gk0VTVLNScfxacTTn7/KeQn8ZaXFp6z9HPNZ1XPF/RSm3Na4PatrUttEe1T3QEdgx3Onf2dpl2tf6s+XPtBdkL5RcFLxZ2E7tzujmXMi4t9rB65i9HXp7q3dL78ErAlbt9nn2DV12uXr9mf+1Kv1X/petm1y/cMLnReZN+s/2W4a22AYOB1l8MfmkdNBxsu210u2PIeKhreP1w94jFyOU7tneu3XW6e2t0w+jwmO/YvfHg8Yl7Yfdm78fdf/Ug9cHyw92PMI/yHvM9Lnki8aT6V9VfmycMJy5O2k4OPPV++nCKOfXit6TfVqZznlGelcxIz9TP6s5emLOfG3q+8fn0C9aL5fnc3/l/r3ip8vL8H5Z/DCwELEy/Yr/ivC54I/qm9q3+295Fj8Un7+LfLS/lvRd9X/eB/qH/o//HmeW0FdxK6SfVT12fXT4/4sRzOCwGm7FqBVBIwhERALyuBYASCAB1CPEPG9f8119+BvrK2fyNwVndL5jhvubRVsMQgCakeCFp04OsQ1LJEgAe5NodqT6WANbT+yf/iqQIPd21PXgaAcDJcjivtwJAQHLFgcNZ9uBwPlUgYhHf1z37f7V9g9e8ITewiP88wfWIYET6HPg21nzjV2fybQVcxfrg2/onng/F50lD/ccAAAA4ZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAKgAgAEAAAAAQAAABigAwAEAAAAAQAAABgAAAAAwf1XlwAAAaNJREFUSA3FlT1LA0EQQBN/gYUYRTksJZVgEbCR/D+7QMr8ABtttBBCsLGzsLG2sxaxED/ie4d77u0dyaE5HHjczn7MzO7M7nU6/yXz+bwLhzCCjTQO+rZhDH3opuNLdRYN4RHe4RIKJ7R34Ro+4AEGSw2mE1iUwT18gpI74WvkGlccu4XNdH0jnYU7cAUacidn37qR23cOxc4aGU0nYUAn7iSWEHkz46w0ocdQu1X6B/AMQZ5o7KfBqNOfwRH8JB7FajGhnmcpKvQe3MEbvILiDm5gPXaCHnZr4vvFGMoEKudKn8YvQIOOe+YzCPop7dwJ3zRfJ7GDuso4YJGRa0yZgg4tUaNXdGrbuZWKKxzYYEJc2xp9AUUjGt8KC2jvgYadF8+10vJyDnNLXwbdiWUZi0fUK01Eoc+AZhCLZVzK4Vq6sDUdz+0dEcbbTTIOJmAyTVhx/WmvrExbv2jtPhWLKodjCtefZiEeZeVZWWSndgwj6fVf3XON8Qwq15++uoqrfYVrow6dGBpCq79ME291jaB0/Q2CPncyht/99MNO/vr9AqW/CGi8sJqbAAAAAElFTkSuQmCC")
+            .previewLayout(.fixed(width: 63, height: 63))
+            .background(.black)
+    }
+}
@@ -17,7 +17,7 @@ struct ConnectContactView: View {
            Text("Scan QR code")
                .font(.title)
                .padding(.bottom)
-            Text("Your chat profile will be sent to your contact.")
+            Text("Your chat profile will be sent to your contact")
                .font(.title2)
                .multilineTextAlignment(.center)
                .padding()
@@ -13,7 +13,9 @@ private let terminalFont = Font.custom("Menlo", size: 16)
 struct TerminalView: View {
    @EnvironmentObject var chatModel: ChatModel
    @State var inProgress: Bool = false
+    @State var message: String = ""
    @FocusState private var keyboardVisible: Bool
+    @State var editing: Bool = false

    var body: some View {
        VStack {
@@ -54,7 +56,9 @@ struct TerminalView: View {
                SendMessageView(
                    sendMessage: sendMessage,
                    inProgress: inProgress,
-                    keyboardVisible: $keyboardVisible
+                    message: $message,
+                    keyboardVisible: $keyboardVisible,
+                    editing: $editing
                )
            }
        }
@@ -10,6 +10,10 @@ import SwiftUI

 let simplexTeamURL = URL(string: "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")!

+let appVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
+
+let appBuild = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion")  as? String
+
 struct SettingsView: View {
    @Environment(\.colorScheme) var colorScheme
    @EnvironmentObject var chatModel: ChatModel
@@ -26,15 +30,18 @@ struct SettingsView: View {
                            .navigationTitle("Your chat profile")
                    } label: {
                        HStack {
-                            Image(systemName: "person.crop.circle")
-                                .padding(.trailing, 8)
+                            ProfileImage(imageStr: user.image)
+                                .frame(width: 44, height: 44)
+                                .padding(.trailing, 6)
+                                .padding(.vertical, 6)
                            VStack(alignment: .leading) {
-                                Text(user.profile.displayName)
+                                Text(user.displayName)
                                    .fontWeight(.bold)
                                    .font(.title2)
-                                Text(user.profile.fullName)
+                                Text(user.fullName)
                            }
                        }
+                        .padding(.leading, -8)
                    }
                    NavigationLink {
                        UserAddress()
@@ -93,13 +100,13 @@ struct SettingsView: View {
                                UIApplication.shared.open(simplexTeamURL)
                            }
                        } label: {
-                            Text("Get help & advice via chat")
+                            Text("Chat with the founder")
                        }
                    }
                    HStack {
                        Image(systemName: "envelope")
                            .padding(.trailing, 4)
-                        Text("[Ask questions via email](mailto:chat@simplex.chat)")
+                        Text("[Send us email](mailto:chat@simplex.chat)")
                    }
                }

@@ -121,11 +128,8 @@ struct SettingsView: View {
                            .padding(.trailing, 8)
                        Text("Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat)")
                    }
+                    Text("v\(appVersion ?? "?") (\(appBuild ?? "?"))")
                }
-
-//                Section("Your SimpleX servers") {
-//
-//                }
            }
            .navigationTitle("Your settings")
        }
@@ -6,3 +6,18 @@
 //

 #import <Foundation/Foundation.h>
+
+#if defined(__x86_64__) && TARGET_IPHONE_SIMULATOR
+
+#import <dirent.h>
+
+int readdir_r$INODE64(DIR *restrict dirp, struct dirent *restrict entry,
+                      struct dirent **restrict result) {
+    return readdir_r(dirp, entry, result);
+}
+
+DIR *opendir$INODE64(const char *name) {
+    return opendir(name);
+}
+
+#endif
@@ -25,10 +25,28 @@
 		5C35CFC927B2782E00FB6C6D /* BGManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C35CFC727B2782E00FB6C6D /* BGManager.swift */; };
 		5C35CFCB27B2E91D00FB6C6D /* NtfManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */; };
 		5C35CFCC27B2E91D00FB6C6D /* NtfManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */; };
+		5C36026827F44386009F19D9 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026327F44385009F19D9 /* libffi.a */; };
+		5C36026927F44386009F19D9 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026327F44385009F19D9 /* libffi.a */; };
+		5C36026A27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026427F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a */; };
+		5C36026B27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026427F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a */; };
+		5C36026C27F44386009F19D9 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026527F44386009F19D9 /* libgmpxx.a */; };
+		5C36026D27F44386009F19D9 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026527F44386009F19D9 /* libgmpxx.a */; };
+		5C36026E27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026627F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a */; };
+		5C36026F27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026627F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a */; };
+		5C36027027F44386009F19D9 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026727F44386009F19D9 /* libgmp.a */; };
+		5C36027127F44386009F19D9 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C36026727F44386009F19D9 /* libgmp.a */; };
+		5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */; };
+		5C3A88CF27DF50170060F1C2 /* DetermineWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */; };
+		5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; };
+		5C3A88D227DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; };
 		5C5346A827B59A6A004DF848 /* ChatHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5346A727B59A6A004DF848 /* ChatHelp.swift */; };
 		5C5346A927B59A6A004DF848 /* ChatHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5346A727B59A6A004DF848 /* ChatHelp.swift */; };
 		5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C577F7C27C83AA10006112D /* MarkdownHelp.swift */; };
 		5C577F7E27C83AA10006112D /* MarkdownHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C577F7C27C83AA10006112D /* MarkdownHelp.swift */; };
+		5C5F2B6D27EBC3FE006A9D5F /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5F2B6C27EBC3FE006A9D5F /* ImagePicker.swift */; };
+		5C5F2B6E27EBC3FE006A9D5F /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5F2B6C27EBC3FE006A9D5F /* ImagePicker.swift */; };
+		5C5F2B7027EBC704006A9D5F /* ProfileImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5F2B6F27EBC704006A9D5F /* ProfileImage.swift */; };
+		5C5F2B7127EBC704006A9D5F /* ProfileImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5F2B6F27EBC704006A9D5F /* ProfileImage.swift */; };
 		5C6AD81327A834E300348BD7 /* NewChatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6AD81227A834E300348BD7 /* NewChatButton.swift */; };
 		5C6AD81427A834E300348BD7 /* NewChatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6AD81227A834E300348BD7 /* NewChatButton.swift */; };
 		5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7505A127B65FDB00BE3227 /* CIMetaView.swift */; };
@@ -45,16 +63,6 @@
 		5C764E85279C748C000C6508 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C764E7C279C71DB000C6508 /* libz.tbd */; };
 		5C764E89279CBCB3000C6508 /* ChatModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C764E88279CBCB3000C6508 /* ChatModel.swift */; };
 		5C764E8A279CBCB3000C6508 /* ChatModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C764E88279CBCB3000C6508 /* ChatModel.swift */; };
-		5C79C23E27DB673900C829D6 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23927DB673800C829D6 /* libffi.a */; };
-		5C79C23F27DB673900C829D6 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23927DB673800C829D6 /* libffi.a */; };
-		5C79C24027DB673900C829D6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23A27DB673800C829D6 /* libgmp.a */; };
-		5C79C24127DB673900C829D6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23A27DB673800C829D6 /* libgmp.a */; };
-		5C79C24227DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23B27DB673800C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a */; };
-		5C79C24327DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23B27DB673800C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a */; };
-		5C79C24427DB673900C829D6 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23C27DB673900C829D6 /* libgmpxx.a */; };
-		5C79C24527DB673900C829D6 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23C27DB673900C829D6 /* libgmpxx.a */; };
-		5C79C24627DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23D27DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a */; };
-		5C79C24727DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C79C23D27DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a */; };
 		5C8F01CD27A6F0D8007D2C8D /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = 5C8F01CC27A6F0D8007D2C8D /* CodeScanner */; };
 		5C971E1D27AEBEF600C8A3CE /* ChatInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */; };
 		5C971E1E27AEBEF600C8A3CE /* ChatInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */; };
@@ -98,12 +106,23 @@
 		5CCD403B27A5F9BE00368C90 /* CreateGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403927A5F9BE00368C90 /* CreateGroupView.swift */; };
 		5CE4407227ADB1D0007B033A /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407127ADB1D0007B033A /* Emoji.swift */; };
 		5CE4407327ADB1D0007B033A /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407127ADB1D0007B033A /* Emoji.swift */; };
-		5CE4407627ADB66A007B033A /* TextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407527ADB66A007B033A /* TextItemView.swift */; };
-		5CE4407727ADB66A007B033A /* TextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407527ADB66A007B033A /* TextItemView.swift */; };
 		5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407827ADB701007B033A /* EmojiItemView.swift */; };
 		5CE4407A27ADB701007B033A /* EmojiItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407827ADB701007B033A /* EmojiItemView.swift */; };
+		5CEACCE327DE9246000BD591 /* ComposeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCE227DE9246000BD591 /* ComposeView.swift */; };
+		5CEACCE427DE9246000BD591 /* ComposeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCE227DE9246000BD591 /* ComposeView.swift */; };
+		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
+		5CEACCEE27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
 		640F50E327CF991C001E05C2 /* SMPServers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640F50E227CF991C001E05C2 /* SMPServers.swift */; };
 		640F50E427CF991C001E05C2 /* SMPServers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640F50E227CF991C001E05C2 /* SMPServers.swift */; };
+		64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6827EE10C800AC7277 /* ContextItemView.swift */; };
+		64AA1C6A27EE10C800AC7277 /* ContextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6827EE10C800AC7277 /* ContextItemView.swift */; };
+		64AA1C6C27F3537400AC7277 /* DeletedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */; };
+		64AA1C6D27F3537400AC7277 /* DeletedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */; };
+		64C2576927F45A42007F8541 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C2576427F45A42007F8541 /* libgmpxx.a */; };
+		64C2576A27F45A42007F8541 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C2576527F45A42007F8541 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a */; };
+		64C2576B27F45A42007F8541 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C2576627F45A42007F8541 /* libgmp.a */; };
+		64C2576C27F45A42007F8541 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C2576727F45A42007F8541 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a */; };
+		64C2576D27F45A42007F8541 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C2576827F45A42007F8541 /* libffi.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -128,15 +147,23 @@
 		5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactRequestView.swift; sourceTree = "<group>"; };
 		5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemView.swift; sourceTree = "<group>"; };
 		5C2E260627A2941F00F70299 /* SimpleXAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXAPI.swift; sourceTree = "<group>"; };
-		5C2E260927A2C63500F70299 /* MyPlayground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = MyPlayground.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		5C2E260A27A30CFA00F70299 /* ChatListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListView.swift; sourceTree = "<group>"; };
 		5C2E260E27A30FDC00F70299 /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
 		5C2E261127A30FEA00F70299 /* TerminalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalView.swift; sourceTree = "<group>"; };
 		5C35CFC727B2782E00FB6C6D /* BGManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGManager.swift; sourceTree = "<group>"; };
 		5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NtfManager.swift; sourceTree = "<group>"; };
+		5C36026327F44385009F19D9 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C36026427F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a"; sourceTree = "<group>"; };
+		5C36026527F44386009F19D9 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C36026627F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5C36026727F44386009F19D9 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetermineWidth.swift; sourceTree = "<group>"; };
+		5C3A88D027DF57800060F1C2 /* FramedItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramedItemView.swift; sourceTree = "<group>"; };
 		5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX (iOS).entitlements"; sourceTree = "<group>"; };
 		5C5346A727B59A6A004DF848 /* ChatHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatHelp.swift; sourceTree = "<group>"; };
 		5C577F7C27C83AA10006112D /* MarkdownHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownHelp.swift; sourceTree = "<group>"; };
+		5C5F2B6C27EBC3FE006A9D5F /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
+		5C5F2B6F27EBC704006A9D5F /* ProfileImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileImage.swift; sourceTree = "<group>"; };
 		5C6AD81227A834E300348BD7 /* NewChatButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewChatButton.swift; sourceTree = "<group>"; };
 		5C7505A127B65FDB00BE3227 /* CIMetaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMetaView.swift; sourceTree = "<group>"; };
 		5C7505A427B679EE00BE3227 /* NavLinkPlain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavLinkPlain.swift; sourceTree = "<group>"; };
@@ -147,11 +174,6 @@
 		5C764E7E279C7275000C6508 /* SimpleX (macOS)-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SimpleX (macOS)-Bridging-Header.h"; sourceTree = "<group>"; };
 		5C764E7F279C7276000C6508 /* dummy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = dummy.m; sourceTree = "<group>"; };
 		5C764E88279CBCB3000C6508 /* ChatModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatModel.swift; sourceTree = "<group>"; };
-		5C79C23927DB673800C829D6 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5C79C23A27DB673800C829D6 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C79C23B27DB673800C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a"; sourceTree = "<group>"; };
-		5C79C23C27DB673900C829D6 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C79C23D27DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a"; sourceTree = "<group>"; };
 		5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoView.swift; sourceTree = "<group>"; };
 		5C971E2027AEBF8300C8A3CE /* ChatInfoImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoImage.swift; sourceTree = "<group>"; };
 		5C9FD96A27A56D4D0075386C /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; };
@@ -179,9 +201,17 @@
 		5CCD403627A5F9A200368C90 /* ConnectContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectContactView.swift; sourceTree = "<group>"; };
 		5CCD403927A5F9BE00368C90 /* CreateGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateGroupView.swift; sourceTree = "<group>"; };
 		5CE4407127ADB1D0007B033A /* Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Emoji.swift; sourceTree = "<group>"; };
-		5CE4407527ADB66A007B033A /* TextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextItemView.swift; sourceTree = "<group>"; };
 		5CE4407827ADB701007B033A /* EmojiItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiItemView.swift; sourceTree = "<group>"; };
+		5CEACCE227DE9246000BD591 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = "<group>"; };
+		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
 		640F50E227CF991C001E05C2 /* SMPServers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SMPServers.swift; sourceTree = "<group>"; };
+		64AA1C6827EE10C800AC7277 /* ContextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextItemView.swift; sourceTree = "<group>"; };
+		64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedItemView.swift; sourceTree = "<group>"; };
+		64C2576427F45A42007F8541 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		64C2576527F45A42007F8541 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a"; sourceTree = "<group>"; };
+		64C2576627F45A42007F8541 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		64C2576727F45A42007F8541 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a"; sourceTree = "<group>"; };
+		64C2576827F45A42007F8541 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -189,14 +219,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5C36026E27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a in Frameworks */,
+				5C36026C27F44386009F19D9 /* libgmpxx.a in Frameworks */,
+				5C36027027F44386009F19D9 /* libgmp.a in Frameworks */,
 				5C8F01CD27A6F0D8007D2C8D /* CodeScanner in Frameworks */,
-				5C79C24027DB673900C829D6 /* libgmp.a in Frameworks */,
 				5C764E83279C748B000C6508 /* libz.tbd in Frameworks */,
 				5C764E82279C748B000C6508 /* libiconv.tbd in Frameworks */,
-				5C79C23E27DB673900C829D6 /* libffi.a in Frameworks */,
-				5C79C24227DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a in Frameworks */,
-				5C79C24627DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a in Frameworks */,
-				5C79C24427DB673900C829D6 /* libgmpxx.a in Frameworks */,
+				5C36026827F44386009F19D9 /* libffi.a in Frameworks */,
+				5C36026A27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -204,13 +234,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C79C24527DB673900C829D6 /* libgmpxx.a in Frameworks */,
-				5C79C24727DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a in Frameworks */,
+				5C36026F27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a in Frameworks */,
+				5C36027127F44386009F19D9 /* libgmp.a in Frameworks */,
 				5C764E85279C748C000C6508 /* libz.tbd in Frameworks */,
-				5C79C23F27DB673900C829D6 /* libffi.a in Frameworks */,
-				5C79C24127DB673900C829D6 /* libgmp.a in Frameworks */,
+				5C36026D27F44386009F19D9 /* libgmpxx.a in Frameworks */,
+				5C36026B27F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a in Frameworks */,
+				5C36026927F44386009F19D9 /* libffi.a in Frameworks */,
 				5C764E84279C748C000C6508 /* libiconv.tbd in Frameworks */,
-				5C79C24327DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -249,10 +279,10 @@
 			isa = PBXGroup;
 			children = (
 				5CE4407427ADB657007B033A /* ChatItem */,
+				5CEACCE527DE977C000BD591 /* ComposeMessage */,
 				5C2E260E27A30FDC00F70299 /* ChatView.swift */,
 				5C7505A727B6D34800BE3227 /* ChatInfoToolbar.swift */,
 				5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */,
-				5C9FD96D27A5D6ED0075386C /* SendMessageView.swift */,
 				5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */,
 				5CE4407127ADB1D0007B033A /* Emoji.swift */,
 			);
@@ -262,11 +292,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C79C23927DB673800C829D6 /* libffi.a */,
-				5C79C23A27DB673800C829D6 /* libgmp.a */,
-				5C79C23C27DB673900C829D6 /* libgmpxx.a */,
-				5C79C23D27DB673900C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2-ghc8.10.7.a */,
-				5C79C23B27DB673800C829D6 /* libHSsimplex-chat-1.3.1-9p94HNy0jcDHEpXhSSIQi2.a */,
+				5C36026327F44385009F19D9 /* libffi.a */,
+				5C36026727F44386009F19D9 /* libgmp.a */,
+				5C36026527F44386009F19D9 /* libgmpxx.a */,
+				5C36026627F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou-ghc8.10.7.a */,
+				5C36026427F44386009F19D9 /* libHSsimplex-chat-1.4.0-35IBkEJuAyg38MasSQs4Ou.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -298,6 +328,9 @@
 				5C971E2027AEBF8300C8A3CE /* ChatInfoImage.swift */,
 				5C7505A427B679EE00BE3227 /* NavLinkPlain.swift */,
 				5CC1C99427A6CF7F000D9FF6 /* ShareSheet.swift */,
+				5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */,
+				5C5F2B6C27EBC3FE006A9D5F /* ImagePicker.swift */,
+				5C5F2B6F27EBC704006A9D5F /* ProfileImage.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -327,7 +360,6 @@
 				5C764E7D279C7275000C6508 /* SimpleX (iOS)-Bridging-Header.h */,
 				5C764E7E279C7275000C6508 /* SimpleX (macOS)-Bridging-Header.h */,
 				5C764E7F279C7276000C6508 /* dummy.m */,
-				5C2E260927A2C63500F70299 /* MyPlayground.playground */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -408,13 +440,25 @@
 		5CE4407427ADB657007B033A /* ChatItem */ = {
 			isa = PBXGroup;
 			children = (
-				5CE4407527ADB66A007B033A /* TextItemView.swift */,
 				5C7505A127B65FDB00BE3227 /* CIMetaView.swift */,
 				5CE4407827ADB701007B033A /* EmojiItemView.swift */,
+				5CEACCEC27DEA495000BD591 /* MsgContentView.swift */,
+				5C3A88D027DF57800060F1C2 /* FramedItemView.swift */,
+				64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */,
 			);
 			path = ChatItem;
 			sourceTree = "<group>";
 		};
+		5CEACCE527DE977C000BD591 /* ComposeMessage */ = {
+			isa = PBXGroup;
+			children = (
+				5C9FD96D27A5D6ED0075386C /* SendMessageView.swift */,
+				5CEACCE227DE9246000BD591 /* ComposeView.swift */,
+				64AA1C6827EE10C800AC7277 /* ContextItemView.swift */,
+			);
+			path = ComposeMessage;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -499,7 +543,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1320;
-				LastUpgradeCheck = 1320;
+				LastUpgradeCheck = 1330;
 				ORGANIZATIONNAME = "SimpleX Chat";
 				TargetAttributes = {
 					5CA059C9279559F40002BEB4 = {
@@ -584,12 +628,13 @@
 			files = (
 				5C6AD81327A834E300348BD7 /* NewChatButton.swift in Sources */,
 				5CB924D727A8563F00ACCCDD /* SettingsView.swift in Sources */,
-				5CE4407627ADB66A007B033A /* TextItemView.swift in Sources */,
+				5CEACCE327DE9246000BD591 /* ComposeView.swift in Sources */,
 				5CB924E127A867BA00ACCCDD /* UserProfile.swift in Sources */,
 				5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */,
 				5C5346A827B59A6A004DF848 /* ChatHelp.swift in Sources */,
 				5C764E80279C7276000C6508 /* dummy.m in Sources */,
 				5C7505A827B6D34800BE3227 /* ChatInfoToolbar.swift in Sources */,
+				5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */,
 				5CB924E427A8683A00ACCCDD /* UserAddress.swift in Sources */,
 				640F50E327CF991C001E05C2 /* SMPServers.swift in Sources */,
 				5C063D2727A4564100AEC577 /* ChatPreviewView.swift in Sources */,
@@ -602,6 +647,7 @@
 				5CB9250D27A9432000ACCCDD /* ChatListNavLink.swift in Sources */,
 				5CA059ED279559F40002BEB4 /* ContentView.swift in Sources */,
 				5CCD403427A5F6DF00368C90 /* AddContactView.swift in Sources */,
+				5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */,
 				5C7505A527B679EE00BE3227 /* NavLinkPlain.swift in Sources */,
 				5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
@@ -609,17 +655,22 @@
 				5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */,
 				5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */,
 				5C971E2127AEBF8300C8A3CE /* ChatInfoImage.swift in Sources */,
+				5C5F2B6D27EBC3FE006A9D5F /* ImagePicker.swift in Sources */,
 				5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */,
 				5CA059EB279559F40002BEB4 /* SimpleXApp.swift in Sources */,
 				5CCD403727A5F9A200368C90 /* ConnectContactView.swift in Sources */,
 				5CCD403A27A5F9BE00368C90 /* CreateGroupView.swift in Sources */,
+				5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */,
 				5C764E89279CBCB3000C6508 /* ChatModel.swift in Sources */,
 				5C971E1D27AEBEF600C8A3CE /* ChatInfoView.swift in Sources */,
 				5CC1C99527A6CF7F000D9FF6 /* ShareSheet.swift in Sources */,
 				5C2E260727A2941F00F70299 /* SimpleXAPI.swift in Sources */,
 				5CB924D427A853F100ACCCDD /* SettingsButton.swift in Sources */,
+				5C5F2B7027EBC704006A9D5F /* ProfileImage.swift in Sources */,
+				64AA1C6C27F3537400AC7277 /* DeletedItemView.swift in Sources */,
 				5CE4407227ADB1D0007B033A /* Emoji.swift in Sources */,
 				5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */,
+				64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -629,12 +680,13 @@
 			files = (
 				5C6AD81427A834E300348BD7 /* NewChatButton.swift in Sources */,
 				5CB924D827A8563F00ACCCDD /* SettingsView.swift in Sources */,
-				5CE4407727ADB66A007B033A /* TextItemView.swift in Sources */,
+				5CEACCE427DE9246000BD591 /* ComposeView.swift in Sources */,
 				5CB924E227A867BA00ACCCDD /* UserProfile.swift in Sources */,
 				5CE4407A27ADB701007B033A /* EmojiItemView.swift in Sources */,
 				5C5346A927B59A6A004DF848 /* ChatHelp.swift in Sources */,
 				5C764E81279C7276000C6508 /* dummy.m in Sources */,
 				5C7505A927B6D34800BE3227 /* ChatInfoToolbar.swift in Sources */,
+				5C3A88D227DF57800060F1C2 /* FramedItemView.swift in Sources */,
 				5CB924E527A8683A00ACCCDD /* UserAddress.swift in Sources */,
 				640F50E427CF991C001E05C2 /* SMPServers.swift in Sources */,
 				5C063D2827A4564100AEC577 /* ChatPreviewView.swift in Sources */,
@@ -647,6 +699,7 @@
 				5CB9250E27A9432000ACCCDD /* ChatListNavLink.swift in Sources */,
 				5CA059EE279559F40002BEB4 /* ContentView.swift in Sources */,
 				5CCD403527A5F6DF00368C90 /* AddContactView.swift in Sources */,
+				5C3A88CF27DF50170060F1C2 /* DetermineWidth.swift in Sources */,
 				5C7505A627B679EE00BE3227 /* NavLinkPlain.swift in Sources */,
 				5C7505A327B65FDB00BE3227 /* CIMetaView.swift in Sources */,
 				5C35CFC927B2782E00FB6C6D /* BGManager.swift in Sources */,
@@ -654,17 +707,22 @@
 				5C2E261027A30FDC00F70299 /* ChatView.swift in Sources */,
 				5C2E260C27A30CFA00F70299 /* ChatListView.swift in Sources */,
 				5C971E2227AEBF8300C8A3CE /* ChatInfoImage.swift in Sources */,
+				5C5F2B6E27EBC3FE006A9D5F /* ImagePicker.swift in Sources */,
 				5C577F7E27C83AA10006112D /* MarkdownHelp.swift in Sources */,
 				5CA059EC279559F40002BEB4 /* SimpleXApp.swift in Sources */,
 				5CCD403827A5F9A200368C90 /* ConnectContactView.swift in Sources */,
 				5CCD403B27A5F9BE00368C90 /* CreateGroupView.swift in Sources */,
+				5CEACCEE27DEA495000BD591 /* MsgContentView.swift in Sources */,
 				5C764E8A279CBCB3000C6508 /* ChatModel.swift in Sources */,
 				5C971E1E27AEBEF600C8A3CE /* ChatInfoView.swift in Sources */,
 				5CC1C99627A6CF7F000D9FF6 /* ShareSheet.swift in Sources */,
 				5C2E260827A2941F00F70299 /* SimpleXAPI.swift in Sources */,
 				5CB924D527A853F100ACCCDD /* SettingsButton.swift in Sources */,
+				5C5F2B7127EBC704006A9D5F /* ProfileImage.swift in Sources */,
+				64AA1C6D27F3537400AC7277 /* DeletedItemView.swift in Sources */,
 				5CE4407327ADB1D0007B033A /* Emoji.swift in Sources */,
 				5C1A4C1F27A715B700EAD5AD /* ChatItemView.swift in Sources */,
+				64AA1C6A27EE10C800AC7277 /* ContextItemView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -821,7 +879,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -841,7 +899,7 @@
 				);
 				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(PROJECT_DIR)/Libraries/ios";
 				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(PROJECT_DIR)/Libraries/sim";
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -861,7 +919,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -881,7 +939,7 @@
 				);
 				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(PROJECT_DIR)/Libraries/ios";
 				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(PROJECT_DIR)/Libraries/sim";
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -939,6 +997,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "CodeScanner",
-        "repositoryURL": "https://github.com/twostraws/CodeScanner",
-        "state": {
-          "branch": null,
-          "revision": "c27a66149b7483fe42e2ec6aad61d5c3fffe522d",
-          "version": "2.1.1"
-        }
+  "pins" : [
+    {
+      "identity" : "codescanner",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/twostraws/CodeScanner",
+      "state" : {
+        "revision" : "c27a66149b7483fe42e2ec6aad61d5c3fffe522d",
+        "version" : "2.1.1"
      }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
@@ -2,20 +2,20 @@ packages: .

 source-repository-package
    type: git
-    location: git://github.com/simplex-chat/simplexmq.git
-    tag: 5c6ec96d6477371d8e617bcc71e6ecbcdd5c78cc
+    location: https://github.com/simplex-chat/simplexmq.git
+    tag: a6ec93c38efcc9f5428602461b233aa00d74bc74

 source-repository-package
    type: git
-    location: git://github.com/simplex-chat/aeson.git
+    location: https://github.com/simplex-chat/aeson.git
    tag: 3eb66f9a68f103b5f1489382aad89f5712a64db7

 source-repository-package
    type: git
-    location: git://github.com/simplex-chat/haskell-terminal.git
+    location: https://github.com/simplex-chat/haskell-terminal.git
    tag: f708b00009b54890172068f168bf98508ffcd495

 source-repository-package
    type: git
-    location: git://github.com/zw3rk/android-support.git
+    location: https://github.com/zw3rk/android-support.git
    tag: 3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb
@@ -133,11 +133,11 @@
    "hackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1646625282,
-        "narHash": "sha256-U23F/EXZC1UOxO3SkfzS82TwYtT42sp5Y6BImXsHWMo=",
+        "lastModified": 1647047557,
+        "narHash": "sha256-6A7jjz77f53GkvFxqVmeuqqXyDWsU24rUtFtOg68CAg=",
        "owner": "input-output-hk",
        "repo": "hackage.nix",
-        "rev": "bff4ab542bc6f68fc078ccd0df2e8eae61650e32",
+        "rev": "fc07d4d4f2597334caa96f455cec190bdcc931f4",
        "type": "github"
      },
      "original": {
@@ -169,11 +169,11 @@
        "stackage": "stackage"
      },
      "locked": {
-        "lastModified": 1646643560,
-        "narHash": "sha256-mCzOavKLzXof7NuTBGQx+KWX2AIarrxxGykBE4OvjzY=",
+        "lastModified": 1647308139,
+        "narHash": "sha256-GRvEGSCz9YQwE/zYUtFYkq2mNm1QxVNyfVwfN+o6mbM=",
        "owner": "input-output-hk",
        "repo": "haskell.nix",
-        "rev": "98de1769b4d5d9a4d137a77c5ec153c900ab0fa5",
+        "rev": "d42e6bdd52b6a36ee54344a0d680ce248e64773f",
        "type": "github"
      },
      "original": {
@@ -217,11 +217,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1645623357,
-        "narHash": "sha256-vAaI91QFn/kY/uMiebW+kG2mPmxirMSJWYtkqkBKdDc=",
+        "lastModified": 1646955661,
+        "narHash": "sha256-AYLta1PubJnrkv15+7G+6ErW5m9NcI9wSdJ+n7pKAe0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9222ae36b208d1c6b55d88e10aa68f969b5b5244",
+        "rev": "e9545762b032559c27d8ec9141ed63ceca1aa1ac",
        "type": "github"
      },
      "original": {
@@ -322,11 +322,11 @@
    "stackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1646625386,
-        "narHash": "sha256-dIsnm5vx9Dlxx/rRjFyO7uMBfKjEN6RX7oAenwfetHY=",
+        "lastModified": 1646961451,
+        "narHash": "sha256-fs3+CsqzgNVT2mJSJOc+MnhbRoIoB/L1ZEhiJn0nXHQ=",
        "owner": "input-output-hk",
        "repo": "stackage.nix",
-        "rev": "e6a7664a79ed4ec8a19d76fb60731190b8763874",
+        "rev": "02b9e7ea7304027b5d473233c2465d04a21a17e3",
        "type": "github"
      },
      "original": {
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 1.3.2
+version: 1.4.1
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -61,6 +61,8 @@ tests:
      - hspec == 2.7.*
      - network == 3.1.*
      - stm == 2.5.*
+    ghc-options:
+      - -threaded

 ghc-options:
  # - -haddock
@@ -0,0 +1,61 @@
+# Message replies and chat item sequential numbers
+
+## Problem
+
+Many chat features require referring to the previous chat items in the same conversation:
+
+- item editing
+- item deletion
+- item reply (with quoting)
+- delivery/read receipts
+- any interactive features mutating chat item state
+- group message integrity via DAG
+
+The most in-demand feature is replies.
+
+## Proposed solution
+
+As group message integrity is needed not for chat items, but for messages, the updated proposal is to introduce a random, non-sequential message id, unique per conversation and per sender.
+
+All above features would rely on this ID, e.g. reply would use the ID of the message that created the item.
+
+We will add an optional property `msgId` into all chat messages (not only visible to the users) and `msgRef` into messages that need to reference other messages.
+
+`msgId` property is a base64 encoded 12 byte binary
+
+JTD for quoting messages:
+
+```yaml
+definitions:
+  msgRef:
+    discriminator: type
+    mapping:
+      direct:
+        properties:
+          msgId: type: string
+          sentAt: type: datetime
+          sent: type: boolean # true if it is in reference to the item that the sender of the message originally sent, false for references to received items
+      group:
+        properties:
+          msgId: type: string
+          sentAt: type: datetime
+          memberId: type: string # base64 member ID of the sender known to all group members for group chats
+  content:
+    properties:
+      type: type: string
+      text:  type: string
+properties:
+  msgId: string
+  event: enum: ["x.msg.new"]
+  params:
+    properties:
+      content: ref: content
+      quote:
+        properties:
+          content: ref: content
+          msgRef: ref: msgRef
+```
+
+This format ensures that replies with quoting show as normal messages on the clients that do not support showing quotes (`quote` property will be ignored).
+
+The only feature that would not work in case chatItem/chatItemRef is missing is navigating to the message to which the message is in reply to.
@@ -1,6 +1,6 @@
 {
-  "git://github.com/simplex-chat/simplexmq.git"."5c6ec96d6477371d8e617bcc71e6ecbcdd5c78cc" = "0qjmldlrxl5waqfbsckjhxkd3zn25bkbyqwf9l0r4gq3c7l6k358";
-  "git://github.com/simplex-chat/aeson.git"."3eb66f9a68f103b5f1489382aad89f5712a64db7" = "0kilkx59fl6c3qy3kjczqvm8c3f4n3p0bdk9biyflf51ljnzp4yp";
-  "git://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
-  "git://github.com/zw3rk/android-support.git"."3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb" = "1r6jyxbim3dsvrmakqfyxbd6ms6miaghpbwyl0sr6dzwpgaprz97";
+  "https://github.com/simplex-chat/simplexmq.git"."a6ec93c38efcc9f5428602461b233aa00d74bc74" = "19a8ad2vpyninq3vfkq4yjaifavhaiwr7jbmxhddg2qn9h8hcsdn";
+  "https://github.com/simplex-chat/aeson.git"."3eb66f9a68f103b5f1489382aad89f5712a64db7" = "0kilkx59fl6c3qy3kjczqvm8c3f4n3p0bdk9biyflf51ljnzp4yp";
+  "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
+  "https://github.com/zw3rk/android-support.git"."3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb" = "1r6jyxbim3dsvrmakqfyxbd6ms6miaghpbwyl0sr6dzwpgaprz97";
 }
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack

 name:           simplex-chat
-version:        1.3.2
+version:        1.4.1
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -31,6 +31,8 @@ library
      Simplex.Chat.Migrations.M20220224_messages_fks
      Simplex.Chat.Migrations.M20220301_smp_servers
      Simplex.Chat.Migrations.M20220302_profile_images
+      Simplex.Chat.Migrations.M20220304_msg_quotes
+      Simplex.Chat.Migrations.M20220321_chat_item_edited
      Simplex.Chat.Mobile
      Simplex.Chat.Options
      Simplex.Chat.Protocol
@@ -126,7 +128,7 @@ test-suite simplex-chat-test
      Paths_simplex_chat
  hs-source-dirs:
      tests
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
  build-depends:
      aeson ==2.0.*
    , ansi-terminal >=0.10 && <0.12
@@ -19,6 +19,7 @@ import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
 import Crypto.Random (drgNew)
+import qualified Data.Aeson as J
 import Data.Attoparsec.ByteString.Char8 (Parser)
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Bifunctor (first)
@@ -37,7 +38,7 @@ import Data.Maybe (fromMaybe, isJust, mapMaybe)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Time.Clock (UTCTime, getCurrentTime)
-import Data.Time.LocalTime (getCurrentTimeZone)
+import Data.Time.LocalTime (getCurrentTimeZone, getZonedTime)
 import Data.Word (Word32)
 import Simplex.Chat.Controller
 import Simplex.Chat.Markdown
@@ -56,7 +57,7 @@ import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (base64P, parseAll)
 import Simplex.Messaging.Protocol (ErrorType (..), MsgBody)
 import qualified Simplex.Messaging.Protocol as SMP
-import Simplex.Messaging.Util (tryError)
+import Simplex.Messaging.Util (tryError, (<$?>))
 import System.Exit (exitFailure, exitSuccess)
 import System.FilePath (combine, splitExtensions, takeFileName)
 import System.IO (Handle, IOMode (..), SeekMode (..), hFlush, openFile, stdout)
@@ -175,16 +176,100 @@ processChatCommand = \case
  APIGetChatItems _pagination -> pure $ chatCmdError "not implemented"
  APISendMessage cType chatId mc -> withUser $ \user@User {userId} -> withChatLock $ case cType of
    CTDirect -> do
-      ct@Contact {localDisplayName = c} <- withStore $ \st -> getContact st userId chatId
-      ci <- sendDirectChatItem userId ct (XMsgNew mc) (CISndMsgContent mc)
-      setActive $ ActiveC c
-      pure . CRNewChatItem $ AChatItem SCTDirect SMDSnd (DirectChat ct) ci
+      ct <- withStore $ \st -> getContact st userId chatId
+      sendNewMsg user ct (MCSimple mc) mc Nothing
    CTGroup -> do
-      group@(Group gInfo@GroupInfo {localDisplayName = gName, membership} _) <- withStore $ \st -> getGroup st user chatId
+      group@(Group GroupInfo {membership} _) <- withStore $ \st -> getGroup st user chatId
      unless (memberActive membership) $ throwChatError CEGroupMemberUserRemoved
-      ci <- sendGroupChatItem userId group (XMsgNew mc) (CISndMsgContent mc)
-      setActive $ ActiveG gName
-      pure . CRNewChatItem $ AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci
+      sendNewGroupMsg user group (MCSimple mc) mc Nothing
+    CTContactRequest -> pure $ chatCmdError "not supported"
+  APISendMessageQuote cType chatId quotedItemId mc -> withUser $ \user@User {userId} -> withChatLock $ case cType of
+    CTDirect -> do
+      (ct, qci) <- withStore $ \st -> (,) <$> getContact st userId chatId <*> getDirectChatItem st userId chatId quotedItemId
+      case qci of
+        CChatItem _ ChatItem {meta = CIMeta {itemTs, itemSharedMsgId}, content = ciContent, formattedText} -> do
+          case ciContent of
+            CISndMsgContent qmc -> send_ CIQDirectSnd True qmc
+            CIRcvMsgContent qmc -> send_ CIQDirectRcv False qmc
+            _ -> throwChatError CEInvalidQuote
+          where
+            send_ :: CIQDirection 'CTDirect -> Bool -> MsgContent -> m ChatResponse
+            send_ chatDir sent qmc =
+              let quotedItem = CIQuote {chatDir, itemId = Just quotedItemId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content = qmc, formattedText}
+                  msgRef = MsgRef {msgId = itemSharedMsgId, sentAt = itemTs, sent, memberId = Nothing}
+               in sendNewMsg user ct (MCQuote QuotedMsg {msgRef, content = qmc} mc) mc (Just quotedItem)
+    CTGroup -> do
+      group@(Group GroupInfo {membership} _) <- withStore $ \st -> getGroup st user chatId
+      unless (memberActive membership) $ throwChatError CEGroupMemberUserRemoved
+      qci <- withStore $ \st -> getGroupChatItem st user chatId quotedItemId
+      case qci of
+        CChatItem _ ChatItem {chatDir, meta = CIMeta {itemTs, itemSharedMsgId}, content = ciContent, formattedText} -> do
+          case (ciContent, chatDir) of
+            (CISndMsgContent qmc, _) -> send_ CIQGroupSnd True membership qmc
+            (CIRcvMsgContent qmc, CIGroupRcv m) -> send_ (CIQGroupRcv $ Just m) False m qmc
+            _ -> throwChatError CEInvalidQuote
+          where
+            send_ :: CIQDirection 'CTGroup -> Bool -> GroupMember -> MsgContent -> m ChatResponse
+            send_ qd sent GroupMember {memberId} content =
+              let quotedItem = CIQuote {chatDir = qd, itemId = Just quotedItemId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content, formattedText}
+                  msgRef = MsgRef {msgId = itemSharedMsgId, sentAt = itemTs, sent, memberId = Just memberId}
+               in sendNewGroupMsg user group (MCQuote QuotedMsg {msgRef, content} mc) mc (Just quotedItem)
+    CTContactRequest -> pure $ chatCmdError "not supported"
+  APIUpdateChatItem cType chatId itemId mc -> withUser $ \user@User {userId} -> withChatLock $ case cType of
+    CTDirect -> do
+      (ct@Contact {contactId, localDisplayName = c}, ci) <- withStore $ \st -> (,) <$> getContact st userId chatId <*> getDirectChatItem st userId chatId itemId
+      case ci of
+        CChatItem SMDSnd ChatItem {meta = CIMeta {itemSharedMsgId}, content = ciContent} -> do
+          case (ciContent, itemSharedMsgId) of
+            (CISndMsgContent _, Just itemSharedMId) -> do
+              SndMessage {msgId} <- sendDirectContactMessage ct (XMsgUpdate itemSharedMId mc)
+              updCi <- withStore $ \st -> updateDirectChatItem st userId contactId itemId (CISndMsgContent mc) msgId
+              setActive $ ActiveC c
+              pure . CRChatItemUpdated $ AChatItem SCTDirect SMDSnd (DirectChat ct) updCi
+            _ -> throwChatError CEInvalidChatItemUpdate
+        CChatItem SMDRcv _ -> throwChatError CEInvalidChatItemUpdate
+    CTGroup -> do
+      Group gInfo@GroupInfo {groupId, localDisplayName = gName, membership} ms <- withStore $ \st -> getGroup st user chatId
+      unless (memberActive membership) $ throwChatError CEGroupMemberUserRemoved
+      ci <- withStore $ \st -> getGroupChatItem st user chatId itemId
+      case ci of
+        CChatItem SMDSnd ChatItem {meta = CIMeta {itemSharedMsgId}, content = ciContent} -> do
+          case (ciContent, itemSharedMsgId) of
+            (CISndMsgContent _, Just itemSharedMId) -> do
+              SndMessage {msgId} <- sendGroupMessage gInfo ms (XMsgUpdate itemSharedMId mc)
+              updCi <- withStore $ \st -> updateGroupChatItem st user groupId itemId (CISndMsgContent mc) msgId
+              setActive $ ActiveG gName
+              pure . CRChatItemUpdated $ AChatItem SCTGroup SMDSnd (GroupChat gInfo) updCi
+            _ -> throwChatError CEInvalidChatItemUpdate
+        CChatItem SMDRcv _ -> throwChatError CEInvalidChatItemUpdate
+    CTContactRequest -> pure $ chatCmdError "not supported"
+  APIDeleteChatItem cType chatId itemId mode -> withUser $ \user@User {userId} -> withChatLock $ case cType of
+    CTDirect -> do
+      (ct@Contact {localDisplayName = c}, CChatItem msgDir deletedItem@ChatItem {meta = CIMeta {itemSharedMsgId}}) <- withStore $ \st -> (,) <$> getContact st userId chatId <*> getDirectChatItem st userId chatId itemId
+      case (mode, msgDir, itemSharedMsgId) of
+        (CIDMInternal, _, _) -> do
+          toCi <- withStore $ \st -> deleteDirectChatItemInternal st userId ct itemId
+          pure $ CRChatItemDeleted (AChatItem SCTDirect msgDir (DirectChat ct) deletedItem) toCi
+        (CIDMBroadcast, SMDSnd, Just itemSharedMId) -> do
+          SndMessage {msgId} <- sendDirectContactMessage ct (XMsgDel itemSharedMId)
+          toCi <- withStore $ \st -> deleteDirectChatItemSndBroadcast st userId ct itemId msgId
+          setActive $ ActiveC c
+          pure $ CRChatItemDeleted (AChatItem SCTDirect msgDir (DirectChat ct) deletedItem) toCi
+        (CIDMBroadcast, _, _) -> throwChatError CEInvalidChatItemDelete
+    CTGroup -> do
+      Group gInfo@GroupInfo {localDisplayName = gName, membership} ms <- withStore $ \st -> getGroup st user chatId
+      unless (memberActive membership) $ throwChatError CEGroupMemberUserRemoved
+      CChatItem msgDir deletedItem@ChatItem {meta = CIMeta {itemSharedMsgId}} <- withStore $ \st -> getGroupChatItem st user chatId itemId
+      case (mode, msgDir, itemSharedMsgId) of
+        (CIDMInternal, _, _) -> do
+          toCi <- withStore $ \st -> deleteGroupChatItemInternal st user gInfo itemId
+          pure $ CRChatItemDeleted (AChatItem SCTGroup msgDir (GroupChat gInfo) deletedItem) toCi
+        (CIDMBroadcast, SMDSnd, Just itemSharedMId) -> do
+          SndMessage {msgId} <- sendGroupMessage gInfo ms (XMsgDel itemSharedMId)
+          toCi <- withStore $ \st -> deleteGroupChatItemSndBroadcast st user gInfo itemId msgId
+          setActive $ ActiveG gName
+          pure $ CRChatItemDeleted (AChatItem SCTGroup msgDir (GroupChat gInfo) deletedItem) toCi
+        (CIDMBroadcast, _, _) -> throwChatError CEInvalidChatItemDelete
    CTContactRequest -> pure $ chatCmdError "not supported"
  APIChatRead cType chatId fromToIds -> withChatLock $ case cType of
    CTDirect -> withStore (\st -> updateDirectChatItemsRead st chatId fromToIds) $> CRCmdOk
@@ -215,6 +300,7 @@ processChatCommand = \case
          `E.finally` deleteContactRequest st userId connReqId
    withAgent $ \a -> rejectContact a connId invId
    pure $ CRContactRequestRejected cReq
+  APIUpdateProfile profile -> withUser (`updateProfile` profile)
  GetUserSMPServers -> CRUserSMPServers <$> withUser (\user -> withStore (`getSMPServers` user))
  SetUserSMPServers smpServers -> withUser $ \user -> withChatLock $ do
    withStore $ \st -> overwriteSMPServers st user smpServers
@@ -233,7 +319,7 @@ processChatCommand = \case
  Connect (Just (ACR SCMContact cReq)) -> withUser $ \User {userId, profile} ->
    connectViaContact userId cReq profile
  Connect Nothing -> throwChatError CEInvalidConnReq
-  ConnectAdmin -> withUser $ \User {userId, profile} ->
+  ConnectSimplex -> withUser $ \User {userId, profile} ->
    connectViaContact userId adminContactReq profile
  DeleteContact cName -> withUser $ \User {userId} -> do
    contactId <- withStore $ \st -> getContactIdByName st userId cName
@@ -264,6 +350,20 @@ processChatCommand = \case
    contactId <- withStore $ \st -> getContactIdByName st userId cName
    let mc = MCText $ safeDecodeUtf8 msg
    processChatCommand $ APISendMessage CTDirect contactId mc
+  SendMessageBroadcast msg -> withUser $ \user -> do
+    contacts <- withStore (`getUserContacts` user)
+    withChatLock . procCmd $ do
+      let mc = MCText $ safeDecodeUtf8 msg
+          cts = filter isReady contacts
+      forM_ cts $ \ct ->
+        void (sendDirectChatItem user ct (XMsgNew $ MCSimple mc) (CISndMsgContent mc) Nothing)
+          `catchError` (toView . CRChatError)
+      CRBroadcastSent mc (length cts) <$> liftIO getZonedTime
+  SendMessageQuote cName (AMsgDirection msgDir) quotedMsg msg -> withUser $ \User {userId} -> do
+    contactId <- withStore $ \st -> getContactIdByName st userId cName
+    quotedItemId <- withStore $ \st -> getDirectChatItemIdByText st userId contactId msgDir (safeDecodeUtf8 quotedMsg)
+    let mc = MCText $ safeDecodeUtf8 msg
+    processChatCommand $ APISendMessageQuote CTDirect contactId quotedItemId mc
  NewGroup gProfile -> withUser $ \user -> do
    gVar <- asks idsDrg
    CRGroupCreated <$> withStore (\st -> createNewGroup st gVar user gProfile)
@@ -339,14 +439,19 @@ processChatCommand = \case
    groupId <- withStore $ \st -> getGroupIdByName st user gName
    let mc = MCText $ safeDecodeUtf8 msg
    processChatCommand $ APISendMessage CTGroup groupId mc
-  SendFile cName f -> withUser $ \User {userId} -> withChatLock $ do
+  SendGroupMessageQuote gName cName quotedMsg msg -> withUser $ \user -> do
+    groupId <- withStore $ \st -> getGroupIdByName st user gName
+    quotedItemId <- withStore $ \st -> getGroupChatItemIdByText st user groupId cName (safeDecodeUtf8 quotedMsg)
+    let mc = MCText $ safeDecodeUtf8 msg
+    processChatCommand $ APISendMessageQuote CTGroup groupId quotedItemId mc
+  SendFile cName f -> withUser $ \user@User {userId} -> withChatLock $ do
    (fileSize, chSize) <- checkSndFile f
    contact <- withStore $ \st -> getContactByName st userId cName
-    (agentConnId, fileConnReq) <- withAgent (`createConnection` SCMInvitation)
-    let fileInv = FileInvitation {fileName = takeFileName f, fileSize, fileConnReq}
+    (agentConnId, connReq) <- withAgent (`createConnection` SCMInvitation)
+    let fileInv = FileInvitation {fileName = takeFileName f, fileSize, fileConnReq = ACR SCMInvitation connReq}
    SndFileTransfer {fileId} <- withStore $ \st ->
      createSndFileTransfer st userId contact f fileInv agentConnId chSize
-    ci <- sendDirectChatItem userId contact (XFile fileInv) (CISndFileInvitation fileId f)
+    ci <- sendDirectChatItem user contact (XFile fileInv) (CISndFileInvitation fileId f) Nothing
    withStore $ \st -> updateFileTransferChatItemId st fileId $ chatItemId' ci
    setActive $ ActiveC cName
    pure . CRNewChatItem $ AChatItem SCTDirect SMDSnd (DirectChat contact) ci
@@ -356,22 +461,21 @@ processChatCommand = \case
    unless (memberActive membership) $ throwChatError CEGroupMemberUserRemoved
    let fileName = takeFileName f
    ms <- forM (filter memberActive members) $ \m -> do
-      (connId, fileConnReq) <- withAgent (`createConnection` SCMInvitation)
-      pure (m, connId, FileInvitation {fileName, fileSize, fileConnReq})
+      (connId, connReq) <- withAgent (`createConnection` SCMInvitation)
+      pure (m, connId, FileInvitation {fileName, fileSize, fileConnReq = ACR SCMInvitation connReq})
    fileId <- withStore $ \st -> createSndGroupFileTransfer st userId gInfo ms f fileSize chSize
    -- TODO sendGroupChatItem - same file invitation to all
    forM_ ms $ \(m, _, fileInv) ->
      traverse (\conn -> sendDirectMessage conn (XFile fileInv) (GroupId groupId)) $ memberConn m
    setActive $ ActiveG gName
    -- this is a hack as we have multiple direct messages instead of one per group
-    let ciContent = CISndFileInvitation fileId f
-    createdAt <- liftIO getCurrentTime
-    let ci = mkNewChatItem ciContent 0 createdAt createdAt
-    cItem@ChatItem {meta = CIMeta {itemId}} <- saveChatItem userId (CDGroupSnd gInfo) ci
+    let msg = SndMessage {msgId = 0, sharedMsgId = SharedMsgId "", msgBody = ""}
+        ciContent = CISndFileInvitation fileId f
+    cItem@ChatItem {meta = CIMeta {itemId}} <- saveSndChatItem user (CDGroupSnd gInfo) msg ciContent Nothing
    withStore $ \st -> updateFileTransferChatItemId st fileId itemId
    pure . CRNewChatItem $ AChatItem SCTGroup SMDSnd (GroupChat gInfo) cItem
  ReceiveFile fileId filePath_ -> withUser $ \User {userId} -> do
-    ft@RcvFileTransfer {fileInvitation = FileInvitation {fileName, fileConnReq}, fileStatus} <- withStore $ \st -> getRcvFileTransfer st userId fileId
+    ft@RcvFileTransfer {fileInvitation = FileInvitation {fileName, fileConnReq = ACR _ fileConnReq}, fileStatus} <- withStore $ \st -> getRcvFileTransfer st userId fileId
    unless (fileStatus == RFSNew) . throwChatError $ CEFileAlreadyReceiving fileName
    withChatLock . procCmd $ do
      tryError (withAgent $ \a -> joinConnection a fileConnReq . directMessage $ XFileAcpt fileName) >>= \case
@@ -398,7 +502,7 @@ processChatCommand = \case
    let p = (profile :: Profile) {displayName = displayName, fullName = fullName}
    updateProfile user p
  UpdateProfileImage image -> withUser $ \user@User {profile} -> do
-    let p = (profile :: Profile) {image = Just image}
+    let p = (profile :: Profile) {image}
    updateProfile user p
  QuitChat -> liftIO exitSuccess
  ShowVersion -> pure $ CRVersionInfo versionNumber
@@ -430,6 +534,14 @@ processChatCommand = \case
          connId <- withAgent $ \a -> joinConnection a cReq $ directMessage (XContact profile $ Just xContactId)
          withStore $ \st -> createConnReqConnection st userId connId cReqHash xContactId
          pure CRSentInvitation
+    sendNewMsg user ct@Contact {localDisplayName = c} msgContainer mc quotedItem = do
+      ci <- sendDirectChatItem user ct (XMsgNew msgContainer) (CISndMsgContent mc) quotedItem
+      setActive $ ActiveC c
+      pure . CRNewChatItem $ AChatItem SCTDirect SMDSnd (DirectChat ct) ci
+    sendNewGroupMsg user g@(Group gInfo@GroupInfo {localDisplayName = gName} _) msgContainer mc quotedItem = do
+      ci <- sendGroupChatItem user g (XMsgNew msgContainer) (CISndMsgContent mc) quotedItem
+      setActive $ ActiveG gName
+      pure . CRNewChatItem $ AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci
    contactMember :: Contact -> [GroupMember] -> Maybe GroupMember
    contactMember Contact {contactId} =
      find $ \GroupMember {memberContactId = cId, memberStatus = s} ->
@@ -439,17 +551,21 @@ processChatCommand = \case
      unlessM (doesFileExist f) . throwChatError $ CEFileNotFound f
      (,) <$> getFileSize f <*> asks (fileChunkSize . config)
    updateProfile :: User -> Profile -> m ChatResponse
-    updateProfile user@User {profile = p} p'@Profile {displayName} = do
-      if p' == p
-        then pure CRUserProfileNoChange
-        else do
-          withStore $ \st -> updateUserProfile st user p'
-          let user' = (user :: User) {localDisplayName = displayName, profile = p'}
-          asks currentUser >>= atomically . (`writeTVar` Just user')
-          contacts <- withStore (`getUserContacts` user)
-          withChatLock . procCmd $ do
-            forM_ contacts $ \ct -> sendDirectContactMessage ct $ XInfo p'
-            pure $ CRUserProfileUpdated p p'
+    updateProfile user@User {profile = p} p'@Profile {displayName}
+      | p' == p = pure CRUserProfileNoChange
+      | otherwise = do
+        withStore $ \st -> updateUserProfile st user p'
+        let user' = (user :: User) {localDisplayName = displayName, profile = p'}
+        asks currentUser >>= atomically . (`writeTVar` Just user')
+        contacts <- filter isReady <$> withStore (`getUserContacts` user)
+        withChatLock . procCmd $ do
+          forM_ contacts $ \ct ->
+            void (sendDirectContactMessage ct $ XInfo p') `catchError` (toView . CRChatError)
+          pure $ CRUserProfileUpdated p p'
+    isReady :: Contact -> Bool
+    isReady ct =
+      let s = connStatus $ activeConn (ct :: Contact)
+       in s == ConnReady || s == ConnSndReady
    getRcvFilePath :: Int64 -> Maybe FilePath -> String -> m FilePath
    getRcvFilePath fileId filePath fileName = case filePath of
      Nothing -> do
@@ -536,7 +652,7 @@ subscribeUserConnections user@User {userId} = do
              ms <- pooledForConcurrentlyN n connectedMembers $ \(m@GroupMember {localDisplayName = c}, cId) ->
                (m,) <$> ((subscribe cId $> Nothing) `catchError` (\e -> when ce (toView $ CRMemberSubError g c e) $> Just e))
              toView $ CRGroupSubscribed g
-              pure $ mapMaybe (\(m, e) -> maybe Nothing (Just . MemberSubError m) e) ms
+              pure $ mapMaybe (\(m, e) -> (Just . MemberSubError m) =<< e) ms
    subscribeFiles n = do
      sndFileTransfers <- withStore (`getLiveSndFileTransfers` user)
      pooledForConcurrentlyN_ n sndFileTransfers $ \sft -> subscribeSndFile sft
@@ -617,24 +733,26 @@ processAgentMessage (Just user@User {userId, profile}) agentConnId agentMessage
        INFO connInfo ->
          saveConnInfo conn connInfo
        MSG meta msgBody -> do
-          _ <- saveRcvMSG conn meta msgBody (ConnectionId connId)
+          _ <- saveRcvMSG conn (ConnectionId connId) meta msgBody
          withAckMessage agentConnId meta $ pure ()
          ackMsgDeliveryEvent conn meta
        SENT msgId ->
-          -- ? updateDirectChatItem
+          -- ? updateDirectChatItemStatus
          sentMsgDeliveryEvent conn msgId
        -- TODO print errors
-        MERR _ _ -> pure () -- ? updateDirectChatItem
+        MERR _ _ -> pure () -- ? updateDirectChatItemStatus
        ERR _ -> pure ()
        -- TODO add debugging output
        _ -> pure ()
-      Just ct@Contact {localDisplayName = c} -> case agentMsg of
+      Just ct@Contact {localDisplayName = c, contactId} -> case agentMsg of
        MSG msgMeta msgBody -> do
-          (msgId, chatMsgEvent) <- saveRcvMSG conn msgMeta msgBody (ConnectionId connId)
+          msg@RcvMessage {chatMsgEvent} <- saveRcvMSG conn (ConnectionId connId) msgMeta msgBody
          withAckMessage agentConnId msgMeta $
            case chatMsgEvent of
-              XMsgNew mc -> newContentMessage ct mc msgId msgMeta
-              XFile fInv -> processFileInvitation ct fInv msgId msgMeta
+              XMsgNew mc -> newContentMessage ct mc msg msgMeta
+              XMsgUpdate sharedMsgId mContent -> messageUpdate ct sharedMsgId mContent msg msgMeta
+              XMsgDel sharedMsgId -> messageDelete ct sharedMsgId msg msgMeta
+              XFile fInv -> processFileInvitation ct fInv msg msgMeta
              XInfo p -> xInfo ct p
              XGrpInv gInv -> processGroupInvitation ct gInv
              XInfoProbe probe -> xInfoProbe ct probe
@@ -679,8 +797,8 @@ processAgentMessage (Just user@User {userId, profile}) agentConnId agentMessage
          case chatItemId_ of
            Nothing -> pure ()
            Just chatItemId -> do
-              chatItem <- withStore $ \st -> updateDirectChatItem st chatItemId CISSndSent
-              toView $ CRChatItemUpdated (AChatItem SCTDirect SMDSnd (DirectChat ct) chatItem)
+              chatItem <- withStore $ \st -> updateDirectChatItemStatus st userId contactId chatItemId CISSndSent
+              toView $ CRChatItemStatusUpdated (AChatItem SCTDirect SMDSnd (DirectChat ct) chatItem)
        END -> do
          toView $ CRContactAnotherClient ct
          showToast (c <> "> ") "connected to another client"
@@ -698,8 +816,8 @@ processAgentMessage (Just user@User {userId, profile}) agentConnId agentMessage
          case chatItemId_ of
            Nothing -> pure ()
            Just chatItemId -> do
-              chatItem <- withStore $ \st -> updateDirectChatItem st chatItemId (agentErrToItemStatus err)
-              toView $ CRChatItemUpdated (AChatItem SCTDirect SMDSnd (DirectChat ct) chatItem)
+              chatItem <- withStore $ \st -> updateDirectChatItemStatus st userId contactId chatItemId (agentErrToItemStatus err)
+              toView $ CRChatItemStatusUpdated (AChatItem SCTDirect SMDSnd (DirectChat ct) chatItem)
        ERR _ -> pure ()
        -- TODO add debugging output
        _ -> pure ()
@@ -769,11 +887,13 @@ processAgentMessage (Just user@User {userId, profile}) agentConnId agentMessage
                  notifyMemberConnected gInfo m
                  when (memberCategory m == GCPreMember) $ probeMatchingContacts ct
      MSG msgMeta msgBody -> do
-        (msgId, chatMsgEvent) <- saveRcvMSG conn msgMeta msgBody (GroupId groupId)
+        msg@RcvMessage {chatMsgEvent} <- saveRcvMSG conn (GroupId groupId) msgMeta msgBody
        withAckMessage agentConnId msgMeta $
          case chatMsgEvent of
-            XMsgNew mc -> newGroupContentMessage gInfo m mc msgId msgMeta
-            XFile fInv -> processGroupFileInvitation gInfo m fInv msgId msgMeta
+            XMsgNew mc -> newGroupContentMessage gInfo m mc msg msgMeta
+            XMsgUpdate sharedMsgId mContent -> groupMessageUpdate gInfo m sharedMsgId mContent msg
+            XMsgDel sharedMsgId -> groupMessageDelete gInfo m sharedMsgId msg
+            XFile fInv -> processGroupFileInvitation gInfo m fInv msg msgMeta
            XGrpMemNew memInfo -> xGrpMemNew gInfo m memInfo
            XGrpMemIntro memInfo -> xGrpMemIntro conn gInfo m memInfo
            XGrpMemInv memId introInv -> xGrpMemInv gInfo m memId introInv
@@ -942,39 +1062,89 @@ processAgentMessage (Just user@User {userId, profile}) agentConnId agentMessage
    messageError :: Text -> m ()
    messageError = toView . CRMessageError "error"

-    newContentMessage :: Contact -> MsgContent -> MessageId -> MsgMeta -> m ()
-    newContentMessage ct@Contact {localDisplayName = c} mc msgId msgMeta = do
-      ci <- saveRcvChatItem userId (CDDirectRcv ct) msgId msgMeta (CIRcvMsgContent mc)
+    newContentMessage :: Contact -> MsgContainer -> RcvMessage -> MsgMeta -> m ()
+    newContentMessage ct@Contact {localDisplayName = c} mc msg msgMeta = do
+      let content = mcContent mc
+      ci@ChatItem {formattedText} <- saveRcvChatItem user (CDDirectRcv ct) msg msgMeta (CIRcvMsgContent content)
      toView . CRNewChatItem $ AChatItem SCTDirect SMDRcv (DirectChat ct) ci
      checkIntegrity msgMeta $ toView . CRMsgIntegrityError
-      showToast (c <> "> ") $ msgContentText mc
+      showMsgToast (c <> "> ") content formattedText
      setActive $ ActiveC c

-    newGroupContentMessage :: GroupInfo -> GroupMember -> MsgContent -> MessageId -> MsgMeta -> m ()
-    newGroupContentMessage gInfo m@GroupMember {localDisplayName = c} mc msgId msgMeta = do
-      ci <- saveRcvChatItem userId (CDGroupRcv gInfo m) msgId msgMeta (CIRcvMsgContent mc)
+    messageUpdate :: Contact -> SharedMsgId -> MsgContent -> RcvMessage -> MsgMeta -> m ()
+    messageUpdate ct@Contact {contactId} sharedMsgId mc RcvMessage {msgId} msgMeta = do
+      CChatItem msgDir ChatItem {meta = CIMeta {itemId}} <- withStore $ \st -> getDirectChatItemBySharedMsgId st userId contactId sharedMsgId
+      case msgDir of
+        SMDRcv -> do
+          updCi <- withStore $ \st -> updateDirectChatItem st userId contactId itemId (CIRcvMsgContent mc) msgId
+          toView . CRChatItemUpdated $ AChatItem SCTDirect SMDRcv (DirectChat ct) updCi
+          checkIntegrity msgMeta $ toView . CRMsgIntegrityError
+        SMDSnd -> do
+          messageError "x.msg.update: contact attempted invalid message update"
+          checkIntegrity msgMeta $ toView . CRMsgIntegrityError
+
+    messageDelete :: Contact -> SharedMsgId -> RcvMessage -> MsgMeta -> m ()
+    messageDelete ct@Contact {contactId} sharedMsgId RcvMessage {msgId} msgMeta = do
+      CChatItem msgDir deletedItem@ChatItem {meta = CIMeta {itemId}} <- withStore $ \st -> getDirectChatItemBySharedMsgId st userId contactId sharedMsgId
+      case msgDir of
+        SMDRcv -> do
+          toCi <- withStore $ \st -> deleteDirectChatItemRcvBroadcast st userId ct itemId msgId
+          toView $ CRChatItemDeleted (AChatItem SCTDirect SMDRcv (DirectChat ct) deletedItem) toCi
+          checkIntegrity msgMeta $ toView . CRMsgIntegrityError
+        SMDSnd -> do
+          messageError "x.msg.del: contact attempted invalid message delete"
+          checkIntegrity msgMeta $ toView . CRMsgIntegrityError
+
+    newGroupContentMessage :: GroupInfo -> GroupMember -> MsgContainer -> RcvMessage -> MsgMeta -> m ()
+    newGroupContentMessage gInfo m@GroupMember {localDisplayName = c} mc msg msgMeta = do
+      let content = mcContent mc
+      ci@ChatItem {formattedText} <- saveRcvChatItem user (CDGroupRcv gInfo m) msg msgMeta (CIRcvMsgContent content)
      groupMsgToView gInfo ci msgMeta
      let g = groupName' gInfo
-      showToast ("#" <> g <> " " <> c <> "> ") $ msgContentText mc
+      showMsgToast ("#" <> g <> " " <> c <> "> ") content formattedText
      setActive $ ActiveG g

-    processFileInvitation :: Contact -> FileInvitation -> MessageId -> MsgMeta -> m ()
-    processFileInvitation ct@Contact {localDisplayName = c} fInv msgId msgMeta = do
+    groupMessageUpdate :: GroupInfo -> GroupMember -> SharedMsgId -> MsgContent -> RcvMessage -> m ()
+    groupMessageUpdate gInfo@GroupInfo {groupId} GroupMember {memberId} sharedMsgId mc RcvMessage {msgId} = do
+      CChatItem msgDir ChatItem {chatDir, meta = CIMeta {itemId}} <- withStore $ \st -> getGroupChatItemBySharedMsgId st user groupId sharedMsgId
+      case (msgDir, chatDir) of
+        (SMDRcv, CIGroupRcv m) ->
+          if sameMemberId memberId m
+            then do
+              updCi <- withStore $ \st -> updateGroupChatItem st user groupId itemId (CIRcvMsgContent mc) msgId
+              toView . CRChatItemUpdated $ AChatItem SCTGroup SMDRcv (GroupChat gInfo) updCi
+            else messageError "x.msg.update: group member attempted to update a message of another member"
+        (SMDSnd, _) -> messageError "x.msg.update: group member attempted invalid message update"
+
+    groupMessageDelete :: GroupInfo -> GroupMember -> SharedMsgId -> RcvMessage -> m ()
+    groupMessageDelete gInfo@GroupInfo {groupId} GroupMember {memberId} sharedMsgId RcvMessage {msgId} = do
+      CChatItem msgDir deletedItem@ChatItem {chatDir, meta = CIMeta {itemId}} <- withStore $ \st -> getGroupChatItemBySharedMsgId st user groupId sharedMsgId
+      case (msgDir, chatDir) of
+        (SMDRcv, CIGroupRcv m) ->
+          if sameMemberId memberId m
+            then do
+              toCi <- withStore $ \st -> deleteGroupChatItemRcvBroadcast st user gInfo itemId msgId
+              toView $ CRChatItemDeleted (AChatItem SCTGroup SMDRcv (GroupChat gInfo) deletedItem) toCi
+            else messageError "x.msg.del: group member attempted to delete a message of another member"
+        (SMDSnd, _) -> messageError "x.msg.del: group member attempted invalid message delete"
+
+    processFileInvitation :: Contact -> FileInvitation -> RcvMessage -> MsgMeta -> m ()
+    processFileInvitation ct@Contact {localDisplayName = c} fInv msg msgMeta = do
      -- TODO chunk size has to be sent as part of invitation
      chSize <- asks $ fileChunkSize . config
      ft@RcvFileTransfer {fileId} <- withStore $ \st -> createRcvFileTransfer st userId ct fInv chSize
-      ci <- saveRcvChatItem userId (CDDirectRcv ct) msgId msgMeta (CIRcvFileInvitation ft)
+      ci <- saveRcvChatItem user (CDDirectRcv ct) msg msgMeta (CIRcvFileInvitation ft)
      withStore $ \st -> updateFileTransferChatItemId st fileId $ chatItemId' ci
      toView . CRNewChatItem $ AChatItem SCTDirect SMDRcv (DirectChat ct) ci
      checkIntegrity msgMeta $ toView . CRMsgIntegrityError
      showToast (c <> "> ") "wants to send a file"
      setActive $ ActiveC c

-    processGroupFileInvitation :: GroupInfo -> GroupMember -> FileInvitation -> MessageId -> MsgMeta -> m ()
-    processGroupFileInvitation gInfo m@GroupMember {localDisplayName = c} fInv msgId msgMeta = do
+    processGroupFileInvitation :: GroupInfo -> GroupMember -> FileInvitation -> RcvMessage -> MsgMeta -> m ()
+    processGroupFileInvitation gInfo m@GroupMember {localDisplayName = c} fInv msg msgMeta = do
      chSize <- asks $ fileChunkSize . config
      ft@RcvFileTransfer {fileId} <- withStore $ \st -> createRcvGroupFileTransfer st userId m fInv chSize
-      ci <- saveRcvChatItem userId (CDGroupRcv gInfo m) msgId msgMeta (CIRcvFileInvitation ft)
+      ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg msgMeta (CIRcvFileInvitation ft)
      withStore $ \st -> updateFileTransferChatItemId st fileId $ chatItemId' ci
      groupMsgToView gInfo ci msgMeta
      let g = groupName' gInfo
@@ -1072,7 +1242,7 @@ processAgentMessage (Just user@User {userId, profile}) agentConnId agentMessage
        GCInviteeMember -> do
          members <- withStore $ \st -> getGroupMembers st user gInfo
          case find (sameMemberId memId) members of
-            Nothing -> messageError "x.grp.mem.inv error: referenced member does not exists"
+            Nothing -> messageError "x.grp.mem.inv error: referenced member does not exist"
            Just reMember -> do
              GroupMemberIntro {introId} <- withStore $ \st -> saveIntroInvitation st reMember m introInv
              void $ sendXGrpMemInv gInfo reMember (XGrpMemFwd (memberInfo m) introInv) introId
@@ -1251,27 +1421,27 @@ deleteMemberConnection m@GroupMember {activeConn} = do
  -- withStore $ \st -> deleteGroupMemberConnection st userId m
  forM_ activeConn $ \conn -> withStore $ \st -> updateConnectionStatus st conn ConnDeleted

-sendDirectContactMessage :: ChatMonad m => Contact -> ChatMsgEvent -> m MessageId
+sendDirectContactMessage :: ChatMonad m => Contact -> ChatMsgEvent -> m SndMessage
 sendDirectContactMessage ct@Contact {activeConn = conn@Connection {connId, connStatus}} chatMsgEvent = do
  if connStatus == ConnReady || connStatus == ConnSndReady
    then sendDirectMessage conn chatMsgEvent (ConnectionId connId)
    else throwChatError $ CEContactNotReady ct

-sendDirectMessage :: ChatMonad m => Connection -> ChatMsgEvent -> ConnOrGroupId -> m MessageId
+sendDirectMessage :: ChatMonad m => Connection -> ChatMsgEvent -> ConnOrGroupId -> m SndMessage
 sendDirectMessage conn chatMsgEvent connOrGroupId = do
-  (msgId, msgBody) <- createSndMessage chatMsgEvent connOrGroupId
+  msg@SndMessage {msgId, msgBody} <- createSndMessage chatMsgEvent connOrGroupId
  deliverMessage conn msgBody msgId
-  pure msgId
+  pure msg

-createSndMessage :: ChatMonad m => ChatMsgEvent -> ConnOrGroupId -> m (MessageId, MsgBody)
+createSndMessage :: ChatMonad m => ChatMsgEvent -> ConnOrGroupId -> m SndMessage
 createSndMessage chatMsgEvent connOrGroupId = do
-  let msgBody = directMessage chatMsgEvent
-      newMsg = NewMessage {direction = MDSnd, cmEventTag = toCMEventTag chatMsgEvent, msgBody}
-  msgId <- withStore $ \st -> createNewMessage st newMsg connOrGroupId
-  pure (msgId, msgBody)
+  gVar <- asks idsDrg
+  withStore $ \st -> createNewSndMessage st gVar connOrGroupId $ \sharedMsgId ->
+    let msgBody = strEncode ChatMessage {msgId = Just sharedMsgId, chatMsgEvent}
+     in NewMessage {chatMsgEvent, msgBody}

 directMessage :: ChatMsgEvent -> ByteString
-directMessage chatMsgEvent = strEncode ChatMessage {chatMsgEvent}
+directMessage chatMsgEvent = strEncode ChatMessage {msgId = Nothing, chatMsgEvent}

 deliverMessage :: ChatMonad m => Connection -> MsgBody -> MessageId -> m ()
 deliverMessage conn@Connection {connId} msgBody msgId = do
@@ -1279,18 +1449,18 @@ deliverMessage conn@Connection {connId} msgBody msgId = do
  let sndMsgDelivery = SndMsgDelivery {connId, agentMsgId}
  withStore $ \st -> createSndMsgDelivery st sndMsgDelivery msgId

-sendGroupMessage :: ChatMonad m => GroupInfo -> [GroupMember] -> ChatMsgEvent -> m MessageId
+sendGroupMessage :: ChatMonad m => GroupInfo -> [GroupMember] -> ChatMsgEvent -> m SndMessage
 sendGroupMessage GroupInfo {groupId} members chatMsgEvent =
  sendGroupMessage' members chatMsgEvent groupId Nothing $ pure ()

-sendXGrpMemInv :: ChatMonad m => GroupInfo -> GroupMember -> ChatMsgEvent -> Int64 -> m MessageId
+sendXGrpMemInv :: ChatMonad m => GroupInfo -> GroupMember -> ChatMsgEvent -> Int64 -> m SndMessage
 sendXGrpMemInv GroupInfo {groupId} reMember chatMsgEvent introId =
  sendGroupMessage' [reMember] chatMsgEvent groupId (Just introId) $
    withStore (\st -> updateIntroStatus st introId GMIntroInvForwarded)

-sendGroupMessage' :: ChatMonad m => [GroupMember] -> ChatMsgEvent -> Int64 -> Maybe Int64 -> m () -> m MessageId
+sendGroupMessage' :: ChatMonad m => [GroupMember] -> ChatMsgEvent -> Int64 -> Maybe Int64 -> m () -> m SndMessage
 sendGroupMessage' members chatMsgEvent groupId introId_ postDeliver = do
-  (msgId, msgBody) <- createSndMessage chatMsgEvent (GroupId groupId)
+  msg@SndMessage {msgId, msgBody} <- createSndMessage chatMsgEvent (GroupId groupId)
  -- TODO collect failed deliveries into a single error
  forM_ (filter memberCurrent members) $ \m@GroupMember {groupMemberId} ->
    case memberConn m of
@@ -1299,7 +1469,7 @@ sendGroupMessage' members chatMsgEvent groupId introId_ postDeliver = do
        if not (connStatus == ConnSndReady || connStatus == ConnReady)
          then unless (connStatus == ConnDeleted) $ withStore (\st -> createPendingGroupMessage st groupMemberId msgId introId_)
          else (deliverMessage conn msgBody msgId >> postDeliver) `catchError` const (pure ())
-  pure msgId
+  pure msg

 sendPendingGroupMessages :: ChatMonad m => GroupMember -> Connection -> m ()
 sendPendingGroupMessages GroupMember {groupMemberId, localDisplayName} conn = do
@@ -1312,54 +1482,43 @@ sendPendingGroupMessages GroupMember {groupMemberId, localDisplayName} conn = do
      Nothing -> throwChatError $ CEGroupMemberIntroNotFound localDisplayName
      Just introId -> withStore (\st -> updateIntroStatus st introId GMIntroInvForwarded)

-saveRcvMSG :: ChatMonad m => Connection -> MsgMeta -> MsgBody -> ConnOrGroupId -> m (MessageId, ChatMsgEvent)
-saveRcvMSG Connection {connId} agentMsgMeta msgBody connOrGroupId = do
-  ChatMessage {chatMsgEvent} <- liftEither $ parseChatMessage msgBody
+saveRcvMSG :: ChatMonad m => Connection -> ConnOrGroupId -> MsgMeta -> MsgBody -> m RcvMessage
+saveRcvMSG Connection {connId} connOrGroupId agentMsgMeta msgBody = do
+  ChatMessage {msgId = sharedMsgId_, chatMsgEvent} <- liftEither $ parseChatMessage msgBody
  let agentMsgId = fst $ recipient agentMsgMeta
-      cmEventTag = toCMEventTag chatMsgEvent
-      newMsg = NewMessage {direction = MDRcv, cmEventTag, msgBody}
+      newMsg = NewMessage {chatMsgEvent, msgBody}
      rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta}
-  msgId <- withStore $ \st -> createNewMessageAndRcvMsgDelivery st newMsg connOrGroupId rcvMsgDelivery
-  pure (msgId, chatMsgEvent)
+  withStore $ \st -> createNewMessageAndRcvMsgDelivery st connOrGroupId newMsg sharedMsgId_ rcvMsgDelivery

-sendDirectChatItem :: ChatMonad m => UserId -> Contact -> ChatMsgEvent -> CIContent 'MDSnd -> m (ChatItem 'CTDirect 'MDSnd)
-sendDirectChatItem userId ct chatMsgEvent ciContent = do
-  msgId <- sendDirectContactMessage ct chatMsgEvent
-  saveSndChatItem userId (CDDirectSnd ct) msgId ciContent
+sendDirectChatItem :: ChatMonad m => User -> Contact -> ChatMsgEvent -> CIContent 'MDSnd -> Maybe (CIQuote 'CTDirect) -> m (ChatItem 'CTDirect 'MDSnd)
+sendDirectChatItem user ct chatMsgEvent ciContent quotedItem = do
+  msg <- sendDirectContactMessage ct chatMsgEvent
+  saveSndChatItem user (CDDirectSnd ct) msg ciContent quotedItem

-sendGroupChatItem :: ChatMonad m => UserId -> Group -> ChatMsgEvent -> CIContent 'MDSnd -> m (ChatItem 'CTGroup 'MDSnd)
-sendGroupChatItem userId (Group g ms) chatMsgEvent ciContent = do
-  msgId <- sendGroupMessage g ms chatMsgEvent
-  saveSndChatItem userId (CDGroupSnd g) msgId ciContent
+sendGroupChatItem :: ChatMonad m => User -> Group -> ChatMsgEvent -> CIContent 'MDSnd -> Maybe (CIQuote 'CTGroup) -> m (ChatItem 'CTGroup 'MDSnd)
+sendGroupChatItem user (Group g ms) chatMsgEvent ciContent quotedItem = do
+  msg <- sendGroupMessage g ms chatMsgEvent
+  saveSndChatItem user (CDGroupSnd g) msg ciContent quotedItem

-saveSndChatItem :: ChatMonad m => UserId -> ChatDirection c 'MDSnd -> MessageId -> CIContent 'MDSnd -> m (ChatItem c 'MDSnd)
-saveSndChatItem userId cd msgId ciContent = do
+saveSndChatItem :: ChatMonad m => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> Maybe (CIQuote c) -> m (ChatItem c 'MDSnd)
+saveSndChatItem user cd msg@SndMessage {sharedMsgId} content quotedItem = do
  createdAt <- liftIO getCurrentTime
-  saveChatItem userId cd $ mkNewChatItem ciContent msgId createdAt createdAt
+  ciId <- withStore $ \st -> createNewSndChatItem st user cd msg content quotedItem createdAt
+  liftIO $ mkChatItem cd ciId content quotedItem (Just sharedMsgId) createdAt createdAt

-saveRcvChatItem :: ChatMonad m => UserId -> ChatDirection c 'MDRcv -> MessageId -> MsgMeta -> CIContent 'MDRcv -> m (ChatItem c 'MDRcv)
-saveRcvChatItem userId cd msgId MsgMeta {broker = (_, brokerTs)} ciContent = do
+saveRcvChatItem :: ChatMonad m => User -> ChatDirection c 'MDRcv -> RcvMessage -> MsgMeta -> CIContent 'MDRcv -> m (ChatItem c 'MDRcv)
+saveRcvChatItem user cd msg@RcvMessage {sharedMsgId_} MsgMeta {broker = (_, brokerTs)} content = do
  createdAt <- liftIO getCurrentTime
-  saveChatItem userId cd $ mkNewChatItem ciContent msgId brokerTs createdAt
+  (ciId, quotedItem) <- withStore $ \st -> createNewRcvChatItem st user cd msg content brokerTs createdAt -- createNewChatItem st user cd $ mkNewChatItem content msg brokerTs createdAt
+  liftIO $ mkChatItem cd ciId content quotedItem sharedMsgId_ brokerTs createdAt

-saveChatItem :: (ChatMonad m, MsgDirectionI d) => UserId -> ChatDirection c d -> NewChatItem d -> m (ChatItem c d)
-saveChatItem userId cd ci@NewChatItem {itemContent, itemTs, itemText, createdAt} = do
-  tz <- liftIO getCurrentTimeZone
-  ciId <- withStore $ \st -> createNewChatItem st userId cd ci
-  let ciMeta = mkCIMeta ciId itemText ciStatusNew tz itemTs createdAt
-  pure $ ChatItem (toCIDirection cd) ciMeta itemContent $ parseMaybeMarkdownList itemText
-
-mkNewChatItem :: forall d. MsgDirectionI d => CIContent d -> MessageId -> UTCTime -> UTCTime -> NewChatItem d
-mkNewChatItem itemContent msgId itemTs createdAt =
-  NewChatItem
-    { createdByMsgId = if msgId == 0 then Nothing else Just msgId,
-      itemSent = msgDirection @d,
-      itemTs,
-      itemContent,
-      itemText = ciContentToText itemContent,
-      itemStatus = ciStatusNew,
-      createdAt
-    }
+mkChatItem :: MsgDirectionI d => ChatDirection c d -> ChatItemId -> CIContent d -> Maybe (CIQuote c) -> Maybe SharedMsgId -> ChatItemTs -> UTCTime -> IO (ChatItem c d)
+mkChatItem cd ciId content quotedItem sharedMsgId itemTs createdAt = do
+  tz <- getCurrentTimeZone
+  currentTs <- liftIO getCurrentTime
+  let itemText = ciContentToText content
+      meta = mkCIMeta ciId content itemText ciStatusNew sharedMsgId False False tz currentTs itemTs createdAt
+  pure ChatItem {chatDir = toCIDirection cd, meta, content, formattedText = parseMaybeMarkdownList itemText, quotedItem}

 allowAgentConnection :: ChatMonad m => Connection -> ConfirmationId -> ChatMsgEvent -> m ()
 allowAgentConnection conn confId msg = do
@@ -1424,6 +1583,13 @@ getCreateActiveUser st = do
    getWithPrompt :: String -> IO String
    getWithPrompt s = putStr (s <> ": ") >> hFlush stdout >> getLine

+showMsgToast :: (MonadUnliftIO m, MonadReader ChatController m) => Text -> MsgContent -> Maybe MarkdownList -> m ()
+showMsgToast from mc md_ = showToast from $ maybe (msgContentText mc) (mconcat . map hideSecret) md_
+  where
+    hideSecret :: FormattedText -> Text
+    hideSecret FormattedText {format = Just Secret} = "..."
+    hideSecret FormattedText {text} = text
+
 showToast :: (MonadUnliftIO m, MonadReader ChatController m) => Text -> Text -> m ()
 showToast title text = atomically . (`writeTBQueue` Notification {title, text}) =<< asks notifyQ

@@ -1470,16 +1636,21 @@ chatCommandP =
    <|> "/_get chat " *> (APIGetChat <$> chatTypeP <*> A.decimal <* A.space <*> chatPaginationP)
    <|> "/_get items count=" *> (APIGetChatItems <$> A.decimal)
    <|> "/_send " *> (APISendMessage <$> chatTypeP <*> A.decimal <* A.space <*> msgContentP)
+    <|> "/_send_quote " *> (APISendMessageQuote <$> chatTypeP <*> A.decimal <* A.space <*> A.decimal <* A.space <*> msgContentP)
+    <|> "/_update item " *> (APIUpdateChatItem <$> chatTypeP <*> A.decimal <* A.space <*> A.decimal <* A.space <*> msgContentP)
+    <|> "/_delete item " *> (APIDeleteChatItem <$> chatTypeP <*> A.decimal <* A.space <*> A.decimal <* A.space <*> ciDeleteMode)
    <|> "/_read chat " *> (APIChatRead <$> chatTypeP <*> A.decimal <* A.space <*> ((,) <$> ("from=" *> A.decimal) <* A.space <*> ("to=" *> A.decimal)))
    <|> "/_delete " *> (APIDeleteChat <$> chatTypeP <*> A.decimal)
    <|> "/_accept " *> (APIAcceptContact <$> A.decimal)
    <|> "/_reject " *> (APIRejectContact <$> A.decimal)
+    <|> "/_profile " *> (APIUpdateProfile <$> jsonP)
    <|> "/smp_servers default" $> SetUserSMPServers []
    <|> "/smp_servers " *> (SetUserSMPServers <$> smpServersP)
    <|> "/smp_servers" $> GetUserSMPServers
    <|> ("/help files" <|> "/help file" <|> "/hf") $> ChatHelp HSFiles
    <|> ("/help groups" <|> "/help group" <|> "/hg") $> ChatHelp HSGroups
    <|> ("/help address" <|> "/ha") $> ChatHelp HSMyAddress
+    <|> ("/help replies" <|> "/hr") $> ChatHelp HSQuotes
    <|> ("/help" <|> "/h") $> ChatHelp HSMain
    <|> ("/group #" <|> "/group " <|> "/g #" <|> "/g ") *> (NewGroup <$> groupProfile)
    <|> ("/add #" <|> "/add " <|> "/a #" <|> "/a ") *> (AddMember <$> displayName <* A.space <*> displayName <*> memberRole)
@@ -1490,17 +1661,22 @@ chatCommandP =
    <|> ("/members #" <|> "/members " <|> "/ms #" <|> "/ms ") *> (ListMembers <$> displayName)
    <|> ("/groups" <|> "/gs") $> ListGroups
    <|> A.char '#' *> (SendGroupMessage <$> displayName <* A.space <*> A.takeByteString)
+    <|> (">#" <|> "> #") *> (SendGroupMessageQuote <$> displayName <* A.space <*> pure Nothing <*> quotedMsg <*> A.takeByteString)
+    <|> (">#" <|> "> #") *> (SendGroupMessageQuote <$> displayName <* A.space <* optional (A.char '@') <*> (Just <$> displayName) <* A.space <*> quotedMsg <*> A.takeByteString)
    <|> ("/contacts" <|> "/cs") $> ListContacts
    <|> ("/connect " <|> "/c ") *> (Connect <$> ((Just <$> strP) <|> A.takeByteString $> Nothing))
    <|> ("/connect" <|> "/c") $> AddContact
    <|> ("/delete @" <|> "/delete " <|> "/d @" <|> "/d ") *> (DeleteContact <$> displayName)
    <|> A.char '@' *> (SendMessage <$> displayName <* A.space <*> A.takeByteString)
+    <|> (">@" <|> "> @") *> sendMsgQuote (AMsgDirection SMDRcv)
+    <|> (">>@" <|> ">> @") *> sendMsgQuote (AMsgDirection SMDSnd)
+    <|> "/feed " *> (SendMessageBroadcast <$> A.takeByteString)
    <|> ("/file #" <|> "/f #") *> (SendGroupFile <$> displayName <* A.space <*> filePath)
    <|> ("/file @" <|> "/file " <|> "/f @" <|> "/f ") *> (SendFile <$> displayName <* A.space <*> filePath)
    <|> ("/freceive " <|> "/fr ") *> (ReceiveFile <$> A.decimal <*> optional (A.space *> filePath))
    <|> ("/fcancel " <|> "/fc ") *> (CancelFile <$> A.decimal)
    <|> ("/fstatus " <|> "/fs ") *> (FileStatus <$> A.decimal)
-    <|> "/simplex" $> ConnectAdmin
+    <|> "/simplex" $> ConnectSimplex
    <|> ("/address" <|> "/ad") $> CreateMyAddress
    <|> ("/delete_address" <|> "/da") $> DeleteMyAddress
    <|> ("/show_address" <|> "/sa") $> ShowMyAddress
@@ -1509,7 +1685,8 @@ chatCommandP =
    <|> ("/reject @" <|> "/reject " <|> "/rc @" <|> "/rc ") *> (RejectContact <$> displayName)
    <|> ("/markdown" <|> "/m") $> ChatHelp HSMarkdown
    <|> ("/welcome" <|> "/w") $> Welcome
-    <|> "/profile_image " *> (UpdateProfileImage . ProfileImage <$> imageP)
+    <|> "/profile_image " *> (UpdateProfileImage . Just . ProfileImage <$> imageP)
+    <|> "/profile_image" $> UpdateProfileImage Nothing
    <|> ("/profile " <|> "/p ") *> (uncurry UpdateProfile <$> userNames)
    <|> ("/profile" <|> "/p") $> ShowProfile
    <|> ("/quit" <|> "/q" <|> "/exit") $> QuitChat
@@ -1522,8 +1699,13 @@ chatCommandP =
      (CPLast <$ "count=" <*> A.decimal)
        <|> (CPAfter <$ "after=" <*> A.decimal <* A.space <* "count=" <*> A.decimal)
        <|> (CPBefore <$ "before=" <*> A.decimal <* A.space <* "count=" <*> A.decimal)
-    msgContentP = "text " *> (MCText . safeDecodeUtf8 <$> A.takeByteString)
+    msgContentP =
+      "text " *> (MCText . safeDecodeUtf8 <$> A.takeByteString)
+        <|> "json " *> jsonP
+    ciDeleteMode = "broadcast" $> CIDMBroadcast <|> "internal" $> CIDMInternal
    displayName = safeDecodeUtf8 <$> (B.cons <$> A.satisfy refChar <*> A.takeTill (== ' '))
+    sendMsgQuote msgDir = SendMessageQuote <$> displayName <* A.space <*> pure msgDir <*> quotedMsg <*> A.takeByteString
+    quotedMsg = A.char '(' *> A.takeTill (== ')') <* A.char ')' <* optional A.space
    refChar c = c > ' ' && c /= '#' && c /= '@'
    onOffP = ("on" $> True) <|> ("off" $> False)
    userNames = do
@@ -1533,6 +1715,8 @@ chatCommandP =
    userProfile = do
      (cName, fullName) <- userNames
      pure Profile {displayName = cName, fullName, image = Nothing}
+    jsonP :: J.FromJSON a => Parser a
+    jsonP = J.eitherDecodeStrict' <$?> A.takeByteString
    groupProfile = do
      gName <- displayName
      fullName <- fullNameP gName
@@ -20,8 +20,11 @@ import Data.ByteString.Char8 (ByteString)
 import Data.Int (Int64)
 import Data.Map.Strict (Map)
 import Data.Text (Text)
+import Data.Time (ZonedTime)
+import Data.Version (showVersion)
 import GHC.Generics (Generic)
 import Numeric.Natural
+import qualified Paths_simplex_chat as SC
 import Simplex.Chat.Messages
 import Simplex.Chat.Protocol
 import Simplex.Chat.Store (StoreError)
@@ -36,7 +39,7 @@ import System.IO (Handle)
 import UnliftIO.STM

 versionNumber :: String
-versionNumber = "1.3.2"
+versionNumber = showVersion SC.version

 versionStr :: String
 versionStr = "SimpleX Chat v" <> versionNumber
@@ -76,7 +79,7 @@ data ChatController = ChatController
    config :: ChatConfig
  }

-data HelpSection = HSMain | HSFiles | HSGroups | HSMyAddress | HSMarkdown
+data HelpSection = HSMain | HSFiles | HSGroups | HSMyAddress | HSMarkdown | HSQuotes
  deriving (Show, Generic)

 instance ToJSON HelpSection where
@@ -91,17 +94,21 @@ data ChatCommand
  | APIGetChat ChatType Int64 ChatPagination
  | APIGetChatItems Int
  | APISendMessage ChatType Int64 MsgContent
+  | APISendMessageQuote ChatType Int64 ChatItemId MsgContent
+  | APIUpdateChatItem ChatType Int64 ChatItemId MsgContent
+  | APIDeleteChatItem ChatType Int64 ChatItemId CIDeleteMode
  | APIChatRead ChatType Int64 (ChatItemId, ChatItemId)
  | APIDeleteChat ChatType Int64
  | APIAcceptContact Int64
  | APIRejectContact Int64
+  | APIUpdateProfile Profile
  | GetUserSMPServers
  | SetUserSMPServers [SMPServer]
  | ChatHelp HelpSection
  | Welcome
  | AddContact
  | Connect (Maybe AConnectionRequestUri)
-  | ConnectAdmin
+  | ConnectSimplex
  | DeleteContact ContactName
  | ListContacts
  | CreateMyAddress
@@ -111,6 +118,8 @@ data ChatCommand
  | AcceptContact ContactName
  | RejectContact ContactName
  | SendMessage ContactName ByteString
+  | SendMessageQuote {contactName :: ContactName, msgDir :: AMsgDirection, quotedMsg :: ByteString, message :: ByteString}
+  | SendMessageBroadcast ByteString
  | NewGroup GroupProfile
  | AddMember GroupName ContactName GroupMemberRole
  | JoinGroup GroupName
@@ -121,6 +130,7 @@ data ChatCommand
  | ListMembers GroupName
  | ListGroups
  | SendGroupMessage GroupName ByteString
+  | SendGroupMessageQuote {groupName :: GroupName, contactName_ :: Maybe ContactName, quotedMsg :: ByteString, message :: ByteString}
  | SendFile ContactName FilePath
  | SendGroupFile GroupName FilePath
  | ReceiveFile FileTransferId (Maybe FilePath)
@@ -128,7 +138,7 @@ data ChatCommand
  | FileStatus FileTransferId
  | ShowProfile
  | UpdateProfile ContactName Text
-  | UpdateProfileImage ProfileImage
+  | UpdateProfileImage (Maybe ProfileImage)
  | QuitChat
  | ShowVersion
  deriving (Show)
@@ -141,7 +151,10 @@ data ChatResponse
  | CRApiChat {chat :: AChat}
  | CRUserSMPServers {smpServers :: [SMPServer]}
  | CRNewChatItem {chatItem :: AChatItem}
+  | CRChatItemStatusUpdated {chatItem :: AChatItem}
  | CRChatItemUpdated {chatItem :: AChatItem}
+  | CRChatItemDeleted {deletedChatItem :: AChatItem, toChatItem :: AChatItem}
+  | CRBroadcastSent MsgContent Int ZonedTime
  | CRMsgIntegrityError {msgerror :: MsgErrorType} -- TODO make it chat item to support in mobile
  | CRCmdAccepted {corr :: CorrId}
  | CRCmdOk
@@ -289,6 +302,9 @@ data ChatErrorType
  | CEFileSend {fileId :: FileTransferId, agentError :: AgentErrorType}
  | CEFileRcvChunk {message :: String}
  | CEFileInternal {message :: String}
+  | CEInvalidQuote
+  | CEInvalidChatItemUpdate
+  | CEInvalidChatItemDelete
  | CEAgentVersion
  | CECommandError {message :: String}
  deriving (Show, Exception, Generic)
@@ -7,6 +7,7 @@ module Simplex.Chat.Help
    filesHelpInfo,
    groupsHelpInfo,
    myAddressHelpInfo,
+    quotesHelpInfo,
    markdownInfo,
  )
 where
@@ -44,11 +45,7 @@ chatWelcome user =
      "Welcome " <> green userName <> "!",
      "Thank you for installing SimpleX Chat!",
      "",
-      "We have a couple of groups that you can join to play with SimpleX Chat:",
-      highlight "#termux" <> " (Android Termux 📱) - chatting about using SimpleX Chat on Android devices",
-      highlight "#music" <> " (Music 🎸) - favorite music of our team and users",
-      "",
-      "Connect to SimpleX Chat team to be added to these groups - type " <> highlight "/simplex",
+      "Connect to SimpleX Chat lead developer for any questions - just type " <> highlight "/simplex",
      "",
      "Follow our updates:",
      "> Reddit: https://www.reddit.com/r/SimpleXChat/",
@@ -86,7 +83,7 @@ chatHelpInfo =
      green "Create your address: " <> highlight "/address",
      "",
      green "Other commands:",
-      indent <> highlight "/help <topic>    " <> " - help on: files, groups, address, smp_servers",
+      indent <> highlight "/help <topic>    " <> " - help on: files, groups, address, replies, smp_servers",
      indent <> highlight "/profile         " <> " - show / update user profile",
      indent <> highlight "/delete <contact>" <> " - delete contact and all messages with them",
      indent <> highlight "/contacts        " <> " - list contacts",
@@ -146,6 +143,18 @@ myAddressHelpInfo =
      "The commands may be abbreviated: " <> listHighlight ["/ad", "/da", "/sa", "/ac", "/rc"]
    ]

+quotesHelpInfo :: [StyledString]
+quotesHelpInfo =
+  map
+    styleMarkdown
+    [ green "Sending replies to messages",
+      "To quote a message that starts with \"hi\":",
+      indent <> highlight "> @alice (hi) <msg>      " <> " - to reply to alice's most recent message",
+      indent <> highlight ">> @alice (hi) <msg>     " <> " - to quote user's most recent message to alice",
+      indent <> highlight "> #team (hi) <msg>       " <> " - to quote most recent message in the group from any member",
+      indent <> highlight "> #team @alice (hi) <msg>" <> " - to quote alice's most recent message in the group #team"
+    ]
+
 markdownInfo :: [StyledString]
 markdownInfo =
  map
@@ -12,6 +12,7 @@ import qualified Data.Attoparsec.Text as A
 import Data.Char (isDigit)
 import Data.Either (fromRight)
 import Data.Functor (($>))
+import Data.List (intercalate)
 import Data.Maybe (fromMaybe, isNothing)
 import Data.String
 import Data.Text (Text)
@@ -83,6 +84,9 @@ data FormattedText = FormattedText {format :: Maybe Format, text :: Text}
 instance ToJSON FormattedText where
  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}

+instance IsString FormattedText where
+  fromString = FormattedText Nothing . T.pack
+
 type MarkdownList = [FormattedText]

 unmarked :: Text -> Markdown
@@ -90,7 +94,7 @@ unmarked = Markdown Nothing

 parseMaybeMarkdownList :: Text -> Maybe MarkdownList
 parseMaybeMarkdownList s =
-  let m = markdownToList $ parseMarkdown s
+  let m = intercalate ["\n"] . map (markdownToList . parseMarkdown) $ T.lines s
   in if all (isNothing . format) m then Nothing else Just m

 parseMarkdownList :: Text -> MarkdownList
@@ -22,7 +22,7 @@ import Data.Int (Int64)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
-import Data.Time.Clock (UTCTime)
+import Data.Time.Clock (UTCTime, diffUTCTime, nominalDay)
 import Data.Time.LocalTime (TimeZone, ZonedTime, utcToZonedTime)
 import Data.Type.Equality
 import Data.Typeable (Typeable)
@@ -78,7 +78,8 @@ data ChatItem (c :: ChatType) (d :: MsgDirection) = ChatItem
  { chatDir :: CIDirection c d,
    meta :: CIMeta d,
    content :: CIContent d,
-    formattedText :: Maybe [FormattedText]
+    formattedText :: Maybe MarkdownList,
+    quotedItem :: Maybe (CIQuote c)
  }
  deriving (Show, Generic)

@@ -101,9 +102,6 @@ data JSONCIDirection
  | JCIGroupRcv {groupMember :: GroupMember}
  deriving (Generic, Show)

-instance FromJSON JSONCIDirection where
-  parseJSON = J.genericParseJSON . sumTypeJSON $ dropPrefix "JCI"
-
 instance ToJSON JSONCIDirection where
  toJSON = J.genericToJSON . sumTypeJSON $ dropPrefix "JCI"
  toEncoding = J.genericToEncoding . sumTypeJSON $ dropPrefix "JCI"
@@ -150,6 +148,8 @@ data NewChatItem d = NewChatItem
    itemContent :: CIContent d,
    itemText :: Text,
    itemStatus :: CIStatus d,
+    itemSharedMsgId :: Maybe SharedMsgId,
+    itemQuotedMsg :: Maybe QuotedMsg,
    createdAt :: UTCTime
  }
  deriving (Show)
@@ -185,7 +185,7 @@ instance ToJSON ChatStats where
  toEncoding = J.genericToEncoding J.defaultOptions

 -- | type to show a mix of messages from multiple chats
-data AChatItem = forall c d. AChatItem (SChatType c) (SMsgDirection d) (ChatInfo c) (ChatItem c d)
+data AChatItem = forall c d. MsgDirectionI d => AChatItem (SChatType c) (SMsgDirection d) (ChatInfo c) (ChatItem c d)

 deriving instance Show AChatItem

@@ -205,18 +205,66 @@ data CIMeta (d :: MsgDirection) = CIMeta
    itemTs :: ChatItemTs,
    itemText :: Text,
    itemStatus :: CIStatus d,
+    itemSharedMsgId :: Maybe SharedMsgId,
+    itemDeleted :: Bool,
+    itemEdited :: Bool,
+    editable :: Bool,
    localItemTs :: ZonedTime,
    createdAt :: UTCTime
  }
  deriving (Show, Generic)

-mkCIMeta :: ChatItemId -> Text -> CIStatus d -> TimeZone -> ChatItemTs -> UTCTime -> CIMeta d
-mkCIMeta itemId itemText itemStatus tz itemTs createdAt =
+mkCIMeta :: ChatItemId -> CIContent d -> Text -> CIStatus d -> Maybe SharedMsgId -> Bool -> Bool -> TimeZone -> UTCTime -> ChatItemTs -> UTCTime -> CIMeta d
+mkCIMeta itemId itemContent itemText itemStatus itemSharedMsgId itemDeleted itemEdited tz currentTs itemTs createdAt =
  let localItemTs = utcToZonedTime tz itemTs
-   in CIMeta {itemId, itemTs, itemText, itemStatus, localItemTs, createdAt}
+      editable = case itemContent of
+        CISndMsgContent _ -> diffUTCTime currentTs itemTs < nominalDay
+        _ -> False
+   in CIMeta {itemId, itemTs, itemText, itemStatus, itemSharedMsgId, itemDeleted, itemEdited, editable, localItemTs, createdAt}

 instance ToJSON (CIMeta d) where toEncoding = J.genericToEncoding J.defaultOptions

+data CIQuote (c :: ChatType) = CIQuote
+  { chatDir :: CIQDirection c,
+    itemId :: Maybe ChatItemId, -- Nothing in case MsgRef references the item the user did not receive yet
+    sharedMsgId :: Maybe SharedMsgId, -- Nothing for the messages from the old clients
+    sentAt :: UTCTime,
+    content :: MsgContent,
+    formattedText :: Maybe MarkdownList
+  }
+  deriving (Show, Generic)
+
+instance ToJSON (CIQuote c) where
+  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
+  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
+
+data CIQDirection (c :: ChatType) where
+  CIQDirectSnd :: CIQDirection 'CTDirect
+  CIQDirectRcv :: CIQDirection 'CTDirect
+  CIQGroupSnd :: CIQDirection 'CTGroup
+  CIQGroupRcv :: Maybe GroupMember -> CIQDirection 'CTGroup -- member can be Nothing in case MsgRef has memberId that the user is not notified about yet
+
+deriving instance Show (CIQDirection c)
+
+instance ToJSON (CIQDirection c) where
+  toJSON = J.toJSON . jsonCIQDirection
+  toEncoding = J.toEncoding . jsonCIQDirection
+
+jsonCIQDirection :: CIQDirection c -> Maybe JSONCIDirection
+jsonCIQDirection = \case
+  CIQDirectSnd -> Just JCIDirectSnd
+  CIQDirectRcv -> Just JCIDirectRcv
+  CIQGroupSnd -> Just JCIGroupSnd
+  CIQGroupRcv (Just m) -> Just $ JCIGroupRcv m
+  CIQGroupRcv Nothing -> Nothing
+
+quoteMsgDirection :: CIQDirection c -> MsgDirection
+quoteMsgDirection = \case
+  CIQDirectSnd -> MDSnd
+  CIQDirectRcv -> MDRcv
+  CIQGroupSnd -> MDSnd
+  CIQGroupRcv _ -> MDRcv
+
 data CIStatus (d :: MsgDirection) where
  CISSndNew :: CIStatus 'MDSnd
  CISSndSent :: CIStatus 'MDSnd
@@ -242,6 +290,8 @@ instance FromField ACIStatus where fromField = fromTextField_ $ eitherToMaybe .

 data ACIStatus = forall d. MsgDirectionI d => ACIStatus (SMsgDirection d) (CIStatus d)

+deriving instance Show ACIStatus
+
 instance MsgDirectionI d => StrEncoding (CIStatus d) where
  strEncode = \case
    CISSndNew -> "snd_new"
@@ -288,17 +338,34 @@ jsonCIStatus = \case

 type ChatItemId = Int64

+type ChatItemTs = UTCTime
+
 data ChatPagination
  = CPLast Int
  | CPAfter ChatItemId Int
  | CPBefore ChatItemId Int
  deriving (Show)

-type ChatItemTs = UTCTime
+data CIDeleteMode = CIDMBroadcast | CIDMInternal
+  deriving (Show, Generic)
+
+instance ToJSON CIDeleteMode where
+  toJSON = J.genericToJSON . enumJSON $ dropPrefix "CIDM"
+  toEncoding = J.genericToEncoding . enumJSON $ dropPrefix "CIDM"
+
+instance FromJSON CIDeleteMode where
+  parseJSON = J.genericParseJSON . enumJSON $ dropPrefix "CIDM"
+
+ciDeleteModeToText :: CIDeleteMode -> Text
+ciDeleteModeToText = \case
+  CIDMBroadcast -> "this item is deleted (broadcast)"
+  CIDMInternal -> "this item is deleted (internal)"

 data CIContent (d :: MsgDirection) where
  CISndMsgContent :: MsgContent -> CIContent 'MDSnd
  CIRcvMsgContent :: MsgContent -> CIContent 'MDRcv
+  CISndDeleted :: CIDeleteMode -> CIContent 'MDSnd
+  CIRcvDeleted :: CIDeleteMode -> CIContent 'MDRcv
  CISndFileInvitation :: FileTransferId -> FilePath -> CIContent 'MDSnd
  CIRcvFileInvitation :: RcvFileTransfer -> CIContent 'MDRcv

@@ -308,9 +375,16 @@ ciContentToText :: CIContent d -> Text
 ciContentToText = \case
  CISndMsgContent mc -> msgContentText mc
  CIRcvMsgContent mc -> msgContentText mc
+  CISndDeleted cidm -> ciDeleteModeToText cidm
+  CIRcvDeleted cidm -> ciDeleteModeToText cidm
  CISndFileInvitation fId fPath -> "you sent file #" <> T.pack (show fId) <> ": " <> T.pack fPath
  CIRcvFileInvitation RcvFileTransfer {fileInvitation = FileInvitation {fileName}} -> "file " <> T.pack fileName

+msgDirToDeletedContent_ :: SMsgDirection d -> CIDeleteMode -> CIContent d
+msgDirToDeletedContent_ msgDir mode = case msgDir of
+  SMDRcv -> CIRcvDeleted mode
+  SMDSnd -> CISndDeleted mode
+
 -- platform independent
 instance ToField (CIContent d) where
  toField = toField . safeDecodeUtf8 . LB.toStrict . J.encode . dbJsonCIContent
@@ -322,6 +396,8 @@ instance ToJSON (CIContent d) where

 data ACIContent = forall d. ACIContent (SMsgDirection d) (CIContent d)

+deriving instance Show ACIContent
+
 -- platform specific
 instance FromJSON ACIContent where
  parseJSON = fmap aciContentJSON . J.parseJSON
@@ -333,6 +409,8 @@ instance FromField ACIContent where fromField = fromTextField_ $ fmap aciContent
 data JSONCIContent
  = JCISndMsgContent {msgContent :: MsgContent}
  | JCIRcvMsgContent {msgContent :: MsgContent}
+  | JCISndDeleted {deleteMode :: CIDeleteMode}
+  | JCIRcvDeleted {deleteMode :: CIDeleteMode}
  | JCISndFileInvitation {fileId :: FileTransferId, filePath :: FilePath}
  | JCIRcvFileInvitation {rcvFileTransfer :: RcvFileTransfer}
  deriving (Generic)
@@ -348,6 +426,8 @@ jsonCIContent :: CIContent d -> JSONCIContent
 jsonCIContent = \case
  CISndMsgContent mc -> JCISndMsgContent mc
  CIRcvMsgContent mc -> JCIRcvMsgContent mc
+  CISndDeleted cidm -> JCISndDeleted cidm
+  CIRcvDeleted cidm -> JCIRcvDeleted cidm
  CISndFileInvitation fId fPath -> JCISndFileInvitation fId fPath
  CIRcvFileInvitation ft -> JCIRcvFileInvitation ft

@@ -355,6 +435,8 @@ aciContentJSON :: JSONCIContent -> ACIContent
 aciContentJSON = \case
  JCISndMsgContent mc -> ACIContent SMDSnd $ CISndMsgContent mc
  JCIRcvMsgContent mc -> ACIContent SMDRcv $ CIRcvMsgContent mc
+  JCISndDeleted cidm -> ACIContent SMDSnd $ CISndDeleted cidm
+  JCIRcvDeleted cidm -> ACIContent SMDRcv $ CIRcvDeleted cidm
  JCISndFileInvitation fId fPath -> ACIContent SMDSnd $ CISndFileInvitation fId fPath
  JCIRcvFileInvitation ft -> ACIContent SMDRcv $ CIRcvFileInvitation ft

@@ -362,6 +444,8 @@ aciContentJSON = \case
 data DBJSONCIContent
  = DBJCISndMsgContent {msgContent :: MsgContent}
  | DBJCIRcvMsgContent {msgContent :: MsgContent}
+  | DBJCISndDeleted {deleteMode :: CIDeleteMode}
+  | DBJCIRcvDeleted {deleteMode :: CIDeleteMode}
  | DBJCISndFileInvitation {fileId :: FileTransferId, filePath :: FilePath}
  | DBJCIRcvFileInvitation {rcvFileTransfer :: RcvFileTransfer}
  deriving (Generic)
@@ -377,6 +461,8 @@ dbJsonCIContent :: CIContent d -> DBJSONCIContent
 dbJsonCIContent = \case
  CISndMsgContent mc -> DBJCISndMsgContent mc
  CIRcvMsgContent mc -> DBJCIRcvMsgContent mc
+  CISndDeleted cidm -> DBJCISndDeleted cidm
+  CIRcvDeleted cidm -> DBJCIRcvDeleted cidm
  CISndFileInvitation fId fPath -> DBJCISndFileInvitation fId fPath
  CIRcvFileInvitation ft -> DBJCIRcvFileInvitation ft

@@ -384,6 +470,8 @@ aciContentDBJSON :: DBJSONCIContent -> ACIContent
 aciContentDBJSON = \case
  DBJCISndMsgContent mc -> ACIContent SMDSnd $ CISndMsgContent mc
  DBJCIRcvMsgContent mc -> ACIContent SMDRcv $ CIRcvMsgContent mc
+  DBJCISndDeleted cidm -> ACIContent SMDSnd $ CISndDeleted cidm
+  DBJCIRcvDeleted cidm -> ACIContent SMDRcv $ CIRcvDeleted cidm
  DBJCISndFileInvitation fId fPath -> ACIContent SMDSnd $ CISndFileInvitation fId fPath
  DBJCIRcvFileInvitation ft -> ACIContent SMDRcv $ CIRcvFileInvitation ft

@@ -407,12 +495,24 @@ instance ChatTypeI 'CTDirect where chatType = SCTDirect
 instance ChatTypeI 'CTGroup where chatType = SCTGroup

 data NewMessage = NewMessage
-  { direction :: MsgDirection,
-    cmEventTag :: CMEventTag,
+  { chatMsgEvent :: ChatMsgEvent,
    msgBody :: MsgBody
  }
  deriving (Show)

+data SndMessage = SndMessage
+  { msgId :: MessageId,
+    sharedMsgId :: SharedMsgId,
+    msgBody :: MsgBody
+  }
+
+data RcvMessage = RcvMessage
+  { msgId :: MessageId,
+    chatMsgEvent :: ChatMsgEvent,
+    sharedMsgId_ :: Maybe SharedMsgId,
+    msgBody :: MsgBody
+  }
+
 data PendingGroupMessage = PendingGroupMessage
  { msgId :: MessageId,
    cmEventTag :: CMEventTag,
@@ -425,7 +525,7 @@ type MessageId = Int64
 data ConnOrGroupId = ConnectionId Int64 | GroupId Int64

 data MsgDirection = MDRcv | MDSnd
-  deriving (Show, Generic)
+  deriving (Eq, Show, Generic)

 instance FromJSON MsgDirection where
  parseJSON = J.genericParseJSON . enumJSON $ dropPrefix "MD"
@@ -449,11 +549,20 @@ instance TestEquality SMsgDirection where

 instance ToField (SMsgDirection d) where toField = toField . msgDirectionInt . toMsgDirection

+data AMsgDirection = forall d. MsgDirectionI d => AMsgDirection (SMsgDirection d)
+
+deriving instance Show AMsgDirection
+
 toMsgDirection :: SMsgDirection d -> MsgDirection
 toMsgDirection = \case
  SMDRcv -> MDRcv
  SMDSnd -> MDSnd

+fromMsgDirection :: MsgDirection -> AMsgDirection
+fromMsgDirection = \case
+  MDRcv -> AMsgDirection SMDRcv
+  MDSnd -> AMsgDirection SMDSnd
+
 class MsgDirectionI (d :: MsgDirection) where
  msgDirection :: SMsgDirection d

@@ -0,0 +1,24 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20220304_msg_quotes where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20220304_msg_quotes :: Query
+m20220304_msg_quotes =
+  [sql|
+    ALTER TABLE messages ADD COLUMN shared_msg_id BLOB;
+    ALTER TABLE messages ADD COLUMN shared_msg_id_user INTEGER; -- 1 for user messages, NULL for received messages
+    CREATE INDEX idx_messages_shared_msg_id ON messages (shared_msg_id);
+    CREATE UNIQUE INDEX idx_messages_direct_shared_msg_id ON messages (connection_id, shared_msg_id_user, shared_msg_id);
+    CREATE UNIQUE INDEX idx_messages_group_shared_msg_id ON messages (group_id, shared_msg_id_user, shared_msg_id);
+
+    ALTER TABLE chat_items ADD COLUMN shared_msg_id BLOB;
+    ALTER TABLE chat_items ADD COLUMN quoted_shared_msg_id BLOB; -- from MessageRef in QuotedMsg
+    ALTER TABLE chat_items ADD COLUMN quoted_sent_at TEXT; -- from MessageRef in QuotedMsg
+    ALTER TABLE chat_items ADD COLUMN quoted_content TEXT; -- from MsgContent in QuotedMsg (JSON)
+    ALTER TABLE chat_items ADD COLUMN quoted_sent INTEGER; -- from MessageRef, 1 for sent, 0 for received, NULL for messages without quote
+    ALTER TABLE chat_items ADD COLUMN quoted_member_id BLOB; -- from MessageRef
+    CREATE INDEX idx_chat_items_shared_msg_id ON chat_items (shared_msg_id);
+|]
@@ -0,0 +1,12 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20220321_chat_item_edited where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20220321_chat_item_edited :: Query
+m20220321_chat_item_edited =
+  [sql|
+ALTER TABLE chat_items ADD COLUMN item_edited INTEGER; -- 1 for edited
+|]
@@ -12,6 +12,7 @@

 module Simplex.Chat.Protocol where

+import Control.Applicative ((<|>))
 import Control.Monad ((<=<))
 import Data.Aeson (FromJSON, ToJSON, (.:), (.:?), (.=))
 import qualified Data.Aeson as J
@@ -19,15 +20,17 @@ import qualified Data.Aeson.Encoding as JE
 import qualified Data.Aeson.KeyMap as JM
 import qualified Data.Aeson.Types as JT
 import qualified Data.Attoparsec.ByteString.Char8 as A
+import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as LB
 import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
+import Data.Time.Clock (UTCTime)
 import Database.SQLite.Simple.FromField (FromField (..))
 import Database.SQLite.Simple.ToField (ToField (..))
 import GHC.Generics (Generic)
 import Simplex.Chat.Types
-import Simplex.Chat.Util (eitherToMaybe)
+import Simplex.Chat.Util (eitherToMaybe, safeDecodeUtf8)
 import Simplex.Messaging.Agent.Store.SQLite (fromTextField_)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Util ((<$?>))
@@ -52,14 +55,51 @@ updateEntityConnStatus connEntity connStatus = case connEntity of

 -- chat message is sent as JSON with these properties
 data AppMessage = AppMessage
-  { event :: Text,
+  { msgId :: Maybe SharedMsgId,
+    event :: Text,
    params :: J.Object
  }
  deriving (Generic, FromJSON)

-instance ToJSON AppMessage where toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
+instance ToJSON AppMessage where
+  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
+  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}

-newtype ChatMessage = ChatMessage {chatMsgEvent :: ChatMsgEvent}
+newtype SharedMsgId = SharedMsgId ByteString
+  deriving (Eq, Show)
+
+instance FromField SharedMsgId where fromField f = SharedMsgId <$> fromField f
+
+instance ToField SharedMsgId where toField (SharedMsgId m) = toField m
+
+instance StrEncoding SharedMsgId where
+  strEncode (SharedMsgId m) = strEncode m
+  strDecode s = SharedMsgId <$> strDecode s
+  strP = SharedMsgId <$> strP
+
+instance FromJSON SharedMsgId where
+  parseJSON = strParseJSON "SharedMsgId"
+
+instance ToJSON SharedMsgId where
+  toJSON = strToJSON
+  toEncoding = strToJEncoding
+
+data MsgRef = MsgRef
+  { msgId :: Maybe SharedMsgId,
+    sentAt :: UTCTime,
+    sent :: Bool,
+    memberId :: Maybe MemberId -- must be present in all group message references, both referencing sent and received
+  }
+  deriving (Eq, Show, Generic)
+
+instance FromJSON MsgRef where
+  parseJSON = J.genericParseJSON J.defaultOptions {J.omitNothingFields = True}
+
+instance ToJSON MsgRef where
+  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
+  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
+
+data ChatMessage = ChatMessage {msgId :: Maybe SharedMsgId, chatMsgEvent :: ChatMsgEvent}
  deriving (Eq, Show)

 instance StrEncoding ChatMessage where
@@ -68,7 +108,10 @@ instance StrEncoding ChatMessage where
  strP = strDecode <$?> A.takeByteString

 data ChatMsgEvent
-  = XMsgNew MsgContent
+  = XMsgNew MsgContainer
+  | XMsgUpdate SharedMsgId MsgContent
+  | XMsgDel SharedMsgId
+  | XMsgDeleted
  | XFile FileInvitation
  | XFileAcpt String
  | XInfo Profile
@@ -89,60 +132,112 @@ data ChatMsgEvent
  | XInfoProbeCheck ProbeHash
  | XInfoProbeOk Probe
  | XOk
+  | XUnknown {event :: Text, params :: J.Object}
  deriving (Eq, Show)

-data MsgContentType = MCText_ | MCUnknown_
+data QuotedMsg = QuotedMsg {msgRef :: MsgRef, content :: MsgContent}
+  deriving (Eq, Show, Generic, FromJSON)

-instance StrEncoding MsgContentType where
+instance ToJSON QuotedMsg where
+  toEncoding = J.genericToEncoding J.defaultOptions
+  toJSON = J.genericToJSON J.defaultOptions
+
+cmToQuotedMsg :: ChatMsgEvent -> Maybe QuotedMsg
+cmToQuotedMsg = \case
+  XMsgNew (MCQuote quotedMsg _) -> Just quotedMsg
+  _ -> Nothing
+
+data MsgContentTag = MCText_ | MCUnknown_ Text
+
+instance StrEncoding MsgContentTag where
  strEncode = \case
    MCText_ -> "text"
-    MCUnknown_ -> "text"
+    MCUnknown_ t -> encodeUtf8 t
  strDecode = \case
    "text" -> Right MCText_
-    _ -> Right MCUnknown_
+    t -> Right . MCUnknown_ $ safeDecodeUtf8 t
  strP = strDecode <$?> A.takeTill (== ' ')

-instance FromJSON MsgContentType where
+instance FromJSON MsgContentTag where
  parseJSON = strParseJSON "MsgContentType"

-instance ToJSON MsgContentType where
+instance ToJSON MsgContentTag where
  toJSON = strToJSON
  toEncoding = strToJEncoding

-data MsgContent = MCText Text | MCUnknown J.Value Text
+data MsgContainer
+  = MCSimple MsgContent
+  | MCQuote QuotedMsg MsgContent
+  | MCForward MsgContent
+  deriving (Eq, Show)
+
+mcContent :: MsgContainer -> MsgContent
+mcContent = \case
+  MCSimple c -> c
+  MCQuote _ c -> c
+  MCForward c -> c
+
+data MsgContent
+  = MCText Text
+  | MCUnknown {tag :: Text, text :: Text, json :: J.Object}
  deriving (Eq, Show)

 msgContentText :: MsgContent -> Text
 msgContentText = \case
  MCText t -> t
-  MCUnknown _ t -> t
+  MCUnknown {text} -> text

-toMsgContentType :: MsgContent -> MsgContentType
-toMsgContentType = \case
+msgContentTag :: MsgContent -> MsgContentTag
+msgContentTag = \case
  MCText _ -> MCText_
-  MCUnknown {} -> MCUnknown_
+  MCUnknown {tag} -> MCUnknown_ tag
+
+parseMsgContainer :: J.Object -> JT.Parser MsgContainer
+parseMsgContainer v =
+  MCQuote <$> v .: "quote" <*> mc
+    <|> (v .: "forward" >>= \f -> (if f then MCForward else MCSimple) <$> mc)
+    <|> MCSimple <$> mc
+  where
+    mc = v .: "content"

 instance FromJSON MsgContent where
-  parseJSON jv@(J.Object v) = do
+  parseJSON (J.Object v) =
    v .: "type" >>= \case
      MCText_ -> MCText <$> v .: "text"
-      MCUnknown_ -> MCUnknown jv . fromMaybe unknownMsgType <$> v .:? "text"
+      MCUnknown_ tag -> do
+        text <- fromMaybe unknownMsgType <$> v .:? "text"
+        pure MCUnknown {tag, text, json = v}
  parseJSON invalid =
    JT.prependFailure "bad MsgContent, " (JT.typeMismatch "Object" invalid)

 unknownMsgType :: Text
 unknownMsgType = "unknown message type"

+msgContainerJSON :: MsgContainer -> J.Object
+msgContainerJSON = \case
+  MCQuote qm c -> JM.fromList ["quote" .= qm, "content" .= c]
+  MCForward c -> JM.fromList ["forward" .= True, "content" .= c]
+  MCSimple c -> JM.fromList ["content" .= c]
+
 instance ToJSON MsgContent where
  toJSON = \case
-    MCUnknown v _ -> v
+    MCUnknown {json} -> J.Object json
    MCText t -> J.object ["type" .= MCText_, "text" .= t]
  toEncoding = \case
-    MCUnknown v _ -> JE.value v
+    MCUnknown {json} -> JE.value $ J.Object json
    MCText t -> J.pairs $ "type" .= MCText_ <> "text" .= t

+instance ToField MsgContent where
+  toField = toField . safeDecodeUtf8 . LB.toStrict . J.encode
+
+instance FromField MsgContent where
+  fromField = fromTextField_ $ J.decode . LB.fromStrict . encodeUtf8
+
 data CMEventTag
  = XMsgNew_
+  | XMsgUpdate_
+  | XMsgDel_
+  | XMsgDeleted_
  | XFile_
  | XFileAcpt_
  | XInfo_
@@ -163,11 +258,15 @@ data CMEventTag
  | XInfoProbeCheck_
  | XInfoProbeOk_
  | XOk_
+  | XUnknown_ Text
  deriving (Eq, Show)

 instance StrEncoding CMEventTag where
  strEncode = \case
    XMsgNew_ -> "x.msg.new"
+    XMsgUpdate_ -> "x.msg.update"
+    XMsgDel_ -> "x.msg.del"
+    XMsgDeleted_ -> "x.msg.deleted"
    XFile_ -> "x.file"
    XFileAcpt_ -> "x.file.acpt"
    XInfo_ -> "x.info"
@@ -188,8 +287,12 @@ instance StrEncoding CMEventTag where
    XInfoProbeCheck_ -> "x.info.probe.check"
    XInfoProbeOk_ -> "x.info.probe.ok"
    XOk_ -> "x.ok"
+    XUnknown_ t -> encodeUtf8 t
  strDecode = \case
    "x.msg.new" -> Right XMsgNew_
+    "x.msg.update" -> Right XMsgUpdate_
+    "x.msg.del" -> Right XMsgDel_
+    "x.msg.deleted" -> Right XMsgDeleted_
    "x.file" -> Right XFile_
    "x.file.acpt" -> Right XFileAcpt_
    "x.info" -> Right XInfo_
@@ -210,12 +313,15 @@ instance StrEncoding CMEventTag where
    "x.info.probe.check" -> Right XInfoProbeCheck_
    "x.info.probe.ok" -> Right XInfoProbeOk_
    "x.ok" -> Right XOk_
-    _ -> Left "bad CMEventTag"
+    t -> Right . XUnknown_ $ safeDecodeUtf8 t
  strP = strDecode <$?> A.takeTill (== ' ')

 toCMEventTag :: ChatMsgEvent -> CMEventTag
 toCMEventTag = \case
  XMsgNew _ -> XMsgNew_
+  XMsgUpdate _ _ -> XMsgUpdate_
+  XMsgDel _ -> XMsgDel_
+  XMsgDeleted -> XMsgDeleted_
  XFile _ -> XFile_
  XFileAcpt _ -> XFileAcpt_
  XInfo _ -> XInfo_
@@ -236,6 +342,7 @@ toCMEventTag = \case
  XInfoProbeCheck _ -> XInfoProbeCheck_
  XInfoProbeOk _ -> XInfoProbeOk_
  XOk -> XOk_
+  XUnknown t _ -> XUnknown_ t

 cmEventTagT :: Text -> Maybe CMEventTag
 cmEventTagT = eitherToMaybe . strDecode . encodeUtf8
@@ -248,19 +355,24 @@ instance FromField CMEventTag where fromField = fromTextField_ cmEventTagT
 instance ToField CMEventTag where toField = toField . serializeCMEventTag

 appToChatMessage :: AppMessage -> Either String ChatMessage
-appToChatMessage AppMessage {event, params} = do
+appToChatMessage AppMessage {msgId, event, params} = do
  eventTag <- strDecode $ encodeUtf8 event
  chatMsgEvent <- msg eventTag
-  pure ChatMessage {chatMsgEvent}
+  pure ChatMessage {msgId, chatMsgEvent}
  where
    p :: FromJSON a => J.Key -> Either String a
    p key = JT.parseEither (.: key) params
+    opt :: FromJSON a => J.Key -> Either String (Maybe a)
+    opt key = JT.parseEither (.:? key) params
    msg = \case
-      XMsgNew_ -> XMsgNew <$> p "content"
+      XMsgNew_ -> XMsgNew <$> JT.parseEither parseMsgContainer params
+      XMsgUpdate_ -> XMsgUpdate <$> p "msgId" <*> p "content"
+      XMsgDel_ -> XMsgDel <$> p "msgId"
+      XMsgDeleted_ -> pure XMsgDeleted
      XFile_ -> XFile <$> p "file"
      XFileAcpt_ -> XFileAcpt <$> p "fileName"
      XInfo_ -> XInfo <$> p "profile"
-      XContact_ -> XContact <$> p "profile" <*> JT.parseEither (.:? "contactReqId") params
+      XContact_ -> XContact <$> p "profile" <*> opt "contactReqId"
      XGrpInv_ -> XGrpInv <$> p "groupInvitation"
      XGrpAcpt_ -> XGrpAcpt <$> p "memberId"
      XGrpMemNew_ -> XGrpMemNew <$> p "memberInfo"
@@ -277,19 +389,24 @@ appToChatMessage AppMessage {event, params} = do
      XInfoProbeCheck_ -> XInfoProbeCheck <$> p "probeHash"
      XInfoProbeOk_ -> XInfoProbeOk <$> p "probe"
      XOk_ -> pure XOk
+      XUnknown_ t -> pure $ XUnknown t params

 chatToAppMessage :: ChatMessage -> AppMessage
-chatToAppMessage ChatMessage {chatMsgEvent} = AppMessage {event, params}
+chatToAppMessage ChatMessage {msgId, chatMsgEvent} = AppMessage {msgId, event, params}
  where
    event = serializeCMEventTag . toCMEventTag $ chatMsgEvent
    o :: [(J.Key, J.Value)] -> J.Object
    o = JM.fromList
+    key .=? value = maybe id ((:) . (key .=)) value
    params = case chatMsgEvent of
-      XMsgNew content -> o ["content" .= content]
+      XMsgNew container -> msgContainerJSON container
+      XMsgUpdate msgId' content -> o ["msgId" .= msgId', "content" .= content]
+      XMsgDel msgId' -> o ["msgId" .= msgId']
+      XMsgDeleted -> JM.empty
      XFile fileInv -> o ["file" .= fileInv]
      XFileAcpt fileName -> o ["fileName" .= fileName]
-      XInfo profile -> o $ ["profile" .= profile]
-      XContact profile xContactId -> o $ maybe id ((:) . ("contactReqId" .=)) xContactId ["profile" .= profile]
+      XInfo profile -> o ["profile" .= profile]
+      XContact profile xContactId -> o $ ("contactReqId" .=? xContactId) ["profile" .= profile]
      XGrpInv groupInv -> o ["groupInvitation" .= groupInv]
      XGrpAcpt memId -> o ["memberId" .= memId]
      XGrpMemNew memInfo -> o ["memberInfo" .= memInfo]
@@ -306,3 +423,4 @@ chatToAppMessage ChatMessage {chatMsgEvent} = AppMessage {event, params}
      XInfoProbeCheck probeHash -> o ["probeHash" .= probeHash]
      XInfoProbeOk probe -> o ["probe" .= probe]
      XOk -> JM.empty
+      XUnknown _ ps -> ps
@@ -48,6 +48,9 @@ runInputLoop ct cc = forever $ do
      Right SendGroupMessage {} -> True
      Right SendFile {} -> True
      Right SendGroupFile {} -> True
+      Right SendMessageQuote {} -> True
+      Right SendGroupMessageQuote {} -> True
+      Right SendMessageBroadcast {} -> True
      _ -> False

 runTerminalInput :: ChatTerminal -> ChatController -> IO ()
@@ -98,8 +101,10 @@ updateTermState ac tw (key, ms) ts@TerminalState {inputString = s, inputPosition
  _ -> ts
  where
    insertCharsWithContact cs
-      | null s && cs /= "@" && cs /= "#" && cs /= "/" =
+      | null s && cs /= "@" && cs /= "#" && cs /= "/" && cs /= ">" =
        insertChars $ contactPrefix <> cs
+      | s == ">" && cs == " " =
+        insertChars $ cs <> contactPrefix
      | otherwise = insertChars cs
    insertChars = ts' . if p >= length s then append else insert
    append cs = let s' = s <> cs in (s', length s')
@@ -31,7 +31,7 @@ import Database.SQLite.Simple.Internal (Field (..))
 import Database.SQLite.Simple.Ok (Ok (Ok))
 import Database.SQLite.Simple.ToField (ToField (..))
 import GHC.Generics (Generic)
-import Simplex.Messaging.Agent.Protocol (ConnId, ConnectionMode (..), ConnectionRequestUri, InvitationId)
+import Simplex.Messaging.Agent.Protocol (AConnectionRequestUri, ConnId, ConnectionMode (..), ConnectionRequestUri, InvitationId)
 import Simplex.Messaging.Agent.Store.SQLite (fromTextField_)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (dropPrefix, sumTypeJSON)
@@ -522,7 +522,7 @@ type FileTransferId = Int64
 data FileInvitation = FileInvitation
  { fileName :: String,
    fileSize :: Integer,
-    fileConnReq :: ConnReqInvitation
+    fileConnReq :: AConnectionRequestUri
  }
  deriving (Eq, Show, Generic, FromJSON)

@@ -4,6 +4,9 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE TypeApplications #-}

 module Simplex.Chat.View where

@@ -45,7 +48,10 @@ responseToView testView = \case
  CRApiChat chat -> if testView then testViewChat chat else [plain . bshow $ J.encode chat]
  CRUserSMPServers smpServers -> viewSMPServers smpServers testView
  CRNewChatItem (AChatItem _ _ chat item) -> viewChatItem chat item
-  CRChatItemUpdated _ -> []
+  CRChatItemStatusUpdated _ -> []
+  CRChatItemUpdated (AChatItem _ _ chat item) -> viewItemUpdate chat item
+  CRChatItemDeleted (AChatItem _ _ chat deletedItem) (AChatItem _ _ _ toItem) -> viewItemDelete chat deletedItem toItem
+  CRBroadcastSent mc n ts -> viewSentBroadcast mc n ts
  CRMsgIntegrityError mErr -> viewMsgIntegrityError mErr
  CRCmdAccepted _ -> []
  CRCmdOk -> ["ok"]
@@ -54,6 +60,7 @@ responseToView testView = \case
    HSFiles -> filesHelpInfo
    HSGroups -> groupsHelpInfo
    HSMyAddress -> myAddressHelpInfo
+    HSQuotes -> quotesHelpInfo
    HSMarkdown -> markdownInfo
  CRWelcome user -> chatWelcome user
  CRContactsList cs -> viewContactsList cs
@@ -106,7 +113,7 @@ responseToView testView = \case
  CRContactSubscribed c -> [ttyContact' c <> ": connected to server"]
  CRContactSubError c e -> [ttyContact' c <> ": contact error " <> sShow e]
  CRContactSubSummary summary ->
-    (if null subscribed then [] else [sShow (length subscribed) <> " contacts connected (use " <> highlight' "/cs" <> " for the list)"]) <> viewErrorsSummary errors " contact errors"
+    [sShow (length subscribed) <> " contacts connected (use " <> highlight' "/cs" <> " for the list)" | not (null subscribed)] <> viewErrorsSummary errors " contact errors"
    where
      (errors, subscribed) = partition (isJust . contactError) summary
  CRGroupInvitation GroupInfo {localDisplayName = ldn, groupProfile = GroupProfile {fullName}} ->
@@ -148,37 +155,106 @@ responseToView testView = \case
    testViewChat :: AChat -> [StyledString]
    testViewChat (AChat _ Chat {chatItems}) = [sShow $ map toChatView chatItems]
      where
-        toChatView :: CChatItem c -> (Int, Text)
-        toChatView (CChatItem dir ChatItem {meta}) = (msgDirectionInt $ toMsgDirection dir, itemText meta)
+        toChatView :: CChatItem c -> ((Int, Text), Maybe (Int, Text))
+        toChatView (CChatItem dir ChatItem {meta, quotedItem}) =
+          ((msgDirectionInt $ toMsgDirection dir, itemText meta),) $ case quotedItem of
+            Nothing -> Nothing
+            Just CIQuote {chatDir = quoteDir, content} ->
+              Just (msgDirectionInt $ quoteMsgDirection quoteDir, msgContentText content)
    viewErrorsSummary :: [a] -> StyledString -> [StyledString]
-    viewErrorsSummary summary s = if null summary then [] else [styled (colored Red) (T.pack . show $ length summary) <> s <> " (run with -c option to show each error)"]
+    viewErrorsSummary summary s = [ttyError (T.pack . show $ length summary) <> s <> " (run with -c option to show each error)" | not (null summary)]

-viewChatItem :: ChatInfo c -> ChatItem c d -> [StyledString]
-viewChatItem chat (ChatItem cd meta content _) = case (chat, cd) of
-  (DirectChat c, CIDirectSnd) -> case content of
-    CISndMsgContent mc -> viewSentMessage to mc meta
-    CISndFileInvitation fId fPath -> viewSentFileInvitation to fId fPath meta
+viewChatItem :: MsgDirectionI d => ChatInfo c -> ChatItem c d -> [StyledString]
+viewChatItem chat ChatItem {chatDir, meta, content, quotedItem} = case chat of
+  DirectChat c -> case chatDir of
+    CIDirectSnd -> case content of
+      CISndMsgContent mc -> viewSentMessage to quote mc meta
+      CISndDeleted _ -> []
+      CISndFileInvitation fId fPath -> viewSentFileInvitation to fId fPath meta
+      where
+        to = ttyToContact' c
+    CIDirectRcv -> case content of
+      CIRcvMsgContent mc -> viewReceivedMessage from quote meta mc
+      CIRcvDeleted _ -> []
+      CIRcvFileInvitation ft -> viewReceivedFileInvitation from meta ft
+      where
+        from = ttyFromContact' c
    where
-      to = ttyToContact' c
-  (DirectChat c, CIDirectRcv) -> case content of
-    CIRcvMsgContent mc -> viewReceivedMessage from meta mc -- mOk
-    CIRcvFileInvitation ft -> viewReceivedFileInvitation from meta ft -- mOk
+      quote = maybe [] (directQuote chatDir) quotedItem
+  GroupChat g -> case chatDir of
+    CIGroupSnd -> case content of
+      CISndMsgContent mc -> viewSentMessage to quote mc meta
+      CISndDeleted _ -> []
+      CISndFileInvitation fId fPath -> viewSentFileInvitation to fId fPath meta
+      where
+        to = ttyToGroup g
+    CIGroupRcv m -> case content of
+      CIRcvMsgContent mc -> viewReceivedMessage from quote meta mc
+      CIRcvDeleted _ -> []
+      CIRcvFileInvitation ft -> viewReceivedFileInvitation from meta ft
+      where
+        from = ttyFromGroup' g m
    where
-      from = ttyFromContact' c
-  (GroupChat g, CIGroupSnd) -> case content of
-    CISndMsgContent mc -> viewSentMessage to mc meta
-    CISndFileInvitation fId fPath -> viewSentFileInvitation to fId fPath meta
-    where
-      to = ttyToGroup g
-  (GroupChat g, CIGroupRcv m) -> case content of
-    CIRcvMsgContent mc -> viewReceivedMessage from meta mc -- mOk
-    CIRcvFileInvitation ft -> viewReceivedFileInvitation from meta ft -- mOk
-    where
-      from = ttyFromGroup' g m
+      quote = maybe [] (groupQuote g) quotedItem
+  _ -> []
+
+viewItemUpdate :: MsgDirectionI d => ChatInfo c -> ChatItem c d -> [StyledString]
+viewItemUpdate chat ChatItem {chatDir, meta, content, quotedItem} = case chat of
+  DirectChat Contact {localDisplayName = c} -> case chatDir of
+    CIDirectRcv -> case content of
+      CIRcvMsgContent mc -> viewReceivedMessage from quote meta mc
+      _ -> []
+      where
+        from = ttyFromContactEdited c
+        quote = maybe [] (directQuote chatDir) quotedItem
+    CIDirectSnd -> ["item updated"]
+  GroupChat g -> case chatDir of
+    CIGroupRcv GroupMember {localDisplayName = m} -> case content of
+      CIRcvMsgContent mc -> viewReceivedMessage from quote meta mc
+      _ -> []
+      where
+        from = ttyFromGroupEdited g m
+        quote = maybe [] (groupQuote g) quotedItem
+    CIGroupSnd -> ["item updated"]
+  _ -> []
+
+viewItemDelete :: ChatInfo c -> ChatItem c d -> ChatItem c' d' -> [StyledString]
+viewItemDelete chat ChatItem {chatDir, meta, content = deletedContent} ChatItem {content = toContent} = case chat of
+  DirectChat Contact {localDisplayName = c} -> case (chatDir, deletedContent, toContent) of
+    (CIDirectRcv, CIRcvMsgContent mc, CIRcvDeleted mode) -> case mode of
+      CIDMBroadcast -> viewReceivedMessage (ttyFromContactDeleted c) [] meta mc
+      CIDMInternal -> ["item deleted"]
+    (CIDirectSnd, _, _) -> ["item deleted"]
+    _ -> []
+  GroupChat g -> case (chatDir, deletedContent, toContent) of
+    (CIGroupRcv GroupMember {localDisplayName = m}, CIRcvMsgContent mc, CIRcvDeleted mode) -> case mode of
+      CIDMBroadcast -> viewReceivedMessage (ttyFromGroupDeleted g m) [] meta mc
+      CIDMInternal -> ["item deleted"]
+    (CIGroupSnd, _, _) -> ["item deleted"]
+    _ -> []
+  _ -> []
+
+directQuote :: forall d'. MsgDirectionI d' => CIDirection 'CTDirect d' -> CIQuote 'CTDirect -> [StyledString]
+directQuote _ CIQuote {content = qmc, chatDir = quoteDir} =
+  quoteText qmc $ if toMsgDirection (msgDirection @d') == quoteMsgDirection quoteDir then ">>" else ">"
+
+groupQuote :: GroupInfo -> CIQuote 'CTGroup -> [StyledString]
+groupQuote g CIQuote {content = qmc, chatDir = quoteDir} = quoteText qmc . ttyQuotedMember $ sentByMember g quoteDir
+
+sentByMember :: GroupInfo -> CIQDirection 'CTGroup -> Maybe GroupMember
+sentByMember GroupInfo {membership} = \case
+  CIQGroupSnd -> Just membership
+  CIQGroupRcv m -> m
+
+quoteText :: MsgContent -> StyledString -> [StyledString]
+quoteText qmc sentBy = prependFirst (sentBy <> " ") $ msgPreview qmc
+
+msgPreview :: MsgContent -> [StyledString]
+msgPreview = msgPlain . preview . msgContentText
  where
-    ttyToContact' Contact {localDisplayName = c} = ttyToContact c
-    ttyFromContact' Contact {localDisplayName = c} = ttyFromContact c
-    ttyFromGroup' g GroupMember {localDisplayName = m} = ttyFromGroup g m
+    preview t
+      | T.length t <= 120 = t
+      | otherwise = T.take 120 t <> "..."

 viewMsgIntegrityError :: MsgErrorType -> [StyledString]
 viewMsgIntegrityError err = msgError $ case err of
@@ -190,7 +266,7 @@ viewMsgIntegrityError err = msgError $ case err of
  MsgDuplicate -> "duplicate message ID"
  where
    msgError :: String -> [StyledString]
-    msgError s = [styled (colored Red) s]
+    msgError s = [ttyError s]

 viewInvalidConnReq :: [StyledString]
 viewInvalidConnReq =
@@ -357,13 +433,14 @@ viewContactUpdated
    where
      fullNameUpdate = if T.null fullName' || fullName' == n' then " removed full name" else " updated full name: " <> plain fullName'

-viewReceivedMessage :: StyledString -> CIMeta d -> MsgContent -> [StyledString]
-viewReceivedMessage from meta mc = receivedWithTime_ from meta (ttyMsgContent mc)
+viewReceivedMessage :: StyledString -> [StyledString] -> CIMeta d -> MsgContent -> [StyledString]
+viewReceivedMessage from quote meta = receivedWithTime_ from quote meta . ttyMsgContent

-receivedWithTime_ :: StyledString -> CIMeta d -> [StyledString] -> [StyledString]
-receivedWithTime_ from CIMeta {localItemTs, createdAt} styledMsg = do
-  prependFirst (formattedTime <> " " <> from) styledMsg -- ++ showIntegrity mOk
+receivedWithTime_ :: StyledString -> [StyledString] -> CIMeta d -> [StyledString] -> [StyledString]
+receivedWithTime_ from quote CIMeta {localItemTs, createdAt} styledMsg = do
+  prependFirst (formattedTime <> " " <> from) (quote <> prependFirst indent styledMsg)
  where
+    indent = if null quote then "" else "      "
    formattedTime :: StyledString
    formattedTime =
      let localTime = zonedTimeToLocalTime localItemTs
@@ -375,8 +452,13 @@ receivedWithTime_ from CIMeta {localItemTs, createdAt} styledMsg = do
              else "%H:%M"
       in styleTime $ formatTime defaultTimeLocale format localTime

-viewSentMessage :: StyledString -> MsgContent -> CIMeta d -> [StyledString]
-viewSentMessage to = sentWithTime_ . prependFirst to . ttyMsgContent
+viewSentMessage :: StyledString -> [StyledString] -> MsgContent -> CIMeta d -> [StyledString]
+viewSentMessage to quote mc = sentWithTime_ . prependFirst to $ quote <> prependFirst indent (ttyMsgContent mc)
+  where
+    indent = if null quote then "" else "      "
+
+viewSentBroadcast :: MsgContent -> Int -> ZonedTime -> [StyledString]
+viewSentBroadcast mc n ts = prependFirst (highlight' "/feed" <> " (" <> sShow n <> ") " <> ttyMsgTime ts <> " ") (ttyMsgContent mc)

 viewSentFileInvitation :: StyledString -> FileTransferId -> FilePath -> CIMeta d -> [StyledString]
 viewSentFileInvitation to fId fPath = sentWithTime_ $ ttySentFile to fId fPath
@@ -389,9 +471,7 @@ ttyMsgTime :: ZonedTime -> StyledString
 ttyMsgTime = styleTime . formatTime defaultTimeLocale "%H:%M"

 ttyMsgContent :: MsgContent -> [StyledString]
-ttyMsgContent = \case
-  MCText t -> msgPlain t
-  MCUnknown _ t -> msgPlain t
+ttyMsgContent = msgPlain . msgContentText

 ttySentFile :: StyledString -> FileTransferId -> FilePath -> [StyledString]
 ttySentFile to fId fPath = ["/f " <> to <> ttyFilePath fPath, "use " <> highlight ("/fc " <> show fId) <> " to cancel sending"]
@@ -421,7 +501,7 @@ sndFile :: SndFileTransfer -> StyledString
 sndFile SndFileTransfer {fileId, fileName} = fileTransferStr fileId fileName

 viewReceivedFileInvitation :: StyledString -> CIMeta d -> RcvFileTransfer -> [StyledString]
-viewReceivedFileInvitation from meta ft = receivedWithTime_ from meta (receivedFileInvitation_ ft)
+viewReceivedFileInvitation from meta ft = receivedWithTime_ from [] meta (receivedFileInvitation_ ft)

 receivedFileInvitation_ :: RcvFileTransfer -> [StyledString]
 receivedFileInvitation_ RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName, fileSize}} =
@@ -523,6 +603,9 @@ viewChatError = \case
    CEFileSend fileId e -> ["error sending file " <> sShow fileId <> ": " <> sShow e]
    CEFileRcvChunk e -> ["error receiving file: " <> plain e]
    CEFileInternal e -> ["file error: " <> plain e]
+    CEInvalidQuote -> ["cannot reply to this message"]
+    CEInvalidChatItemUpdate -> ["cannot update this item"]
+    CEInvalidChatItemDelete -> ["cannot delete this item"]
    CEAgentVersion -> ["unsupported agent version"]
    CECommandError e -> ["bad chat command: " <> plain e]
  -- e -> ["chat error: " <> sShow e]
@@ -539,6 +622,7 @@ viewChatError = \case
    SEUserContactLinkNotFound -> ["no chat address, to create: " <> highlight' "/ad"]
    SEContactRequestNotFoundByName c -> ["no contact request from " <> ttyContact c]
    SEConnectionNotFound _ -> [] -- TODO mutes delete group error, but also mutes any error from getConnectionEntity
+    SEQuotedChatItemNotFound -> ["message not found - reply is not sent"]
    e -> ["chat db error: " <> sShow e]
  ChatErrorAgent err -> case err of
    SMP SMP.AUTH -> ["error: this connection is deleted"]
@@ -547,7 +631,7 @@ viewChatError = \case
    fileNotFound fileId = ["file " <> sShow fileId <> " not found"]

 ttyContact :: ContactName -> StyledString
-ttyContact = styled (colored Green)
+ttyContact = styled $ colored Green

 ttyContact' :: Contact -> StyledString
 ttyContact' Contact {localDisplayName = c} = ttyContact c
@@ -570,7 +654,26 @@ ttyToContact :: ContactName -> StyledString
 ttyToContact c = styled (colored Cyan) $ "@" <> c <> " "

 ttyFromContact :: ContactName -> StyledString
-ttyFromContact c = styled (colored Yellow) $ c <> "> "
+ttyFromContact c = ttyFrom $ c <> "> "
+
+ttyFromContactEdited :: ContactName -> StyledString
+ttyFromContactEdited c = ttyFrom $ c <> "> [edited] "
+
+ttyFromContactDeleted :: ContactName -> StyledString
+ttyFromContactDeleted c = ttyFrom $ c <> "> [deleted] "
+
+ttyToContact' :: Contact -> StyledString
+ttyToContact' Contact {localDisplayName = c} = ttyToContact c
+
+ttyQuotedContact :: Contact -> StyledString
+ttyQuotedContact Contact {localDisplayName = c} = ttyFrom $ c <> ">"
+
+ttyQuotedMember :: Maybe GroupMember -> StyledString
+ttyQuotedMember (Just GroupMember {localDisplayName = c}) = "> " <> ttyFrom c
+ttyQuotedMember _ = "> " <> ttyFrom "?"
+
+ttyFromContact' :: Contact -> StyledString
+ttyFromContact' Contact {localDisplayName = c} = ttyFromContact c

 ttyGroup :: GroupName -> StyledString
 ttyGroup g = styled (colored Blue) $ "#" <> g
@@ -588,7 +691,19 @@ ttyFullGroup GroupInfo {localDisplayName = g, groupProfile = GroupProfile {fullN
  ttyGroup g <> optFullName g fullName

 ttyFromGroup :: GroupInfo -> ContactName -> StyledString
-ttyFromGroup GroupInfo {localDisplayName = g} c = styled (colored Yellow) $ "#" <> g <> " " <> c <> "> "
+ttyFromGroup GroupInfo {localDisplayName = g} c = ttyFrom $ "#" <> g <> " " <> c <> "> "
+
+ttyFromGroupEdited :: GroupInfo -> ContactName -> StyledString
+ttyFromGroupEdited GroupInfo {localDisplayName = g} c = ttyFrom $ "#" <> g <> " " <> c <> "> [edited] "
+
+ttyFromGroupDeleted :: GroupInfo -> ContactName -> StyledString
+ttyFromGroupDeleted GroupInfo {localDisplayName = g} c = ttyFrom $ "#" <> g <> " " <> c <> "> [deleted] "
+
+ttyFrom :: Text -> StyledString
+ttyFrom = styled $ colored Yellow
+
+ttyFromGroup' :: GroupInfo -> GroupMember -> StyledString
+ttyFromGroup' g GroupMember {localDisplayName = m} = ttyFromGroup g m

 ttyToGroup :: GroupInfo -> StyledString
 ttyToGroup GroupInfo {localDisplayName = g} = styled (colored Cyan) $ "#" <> g <> " "
@@ -602,10 +717,16 @@ optFullName localDisplayName fullName
  | otherwise = plain (" (" <> fullName <> ")")

 highlight :: StyledFormat a => a -> StyledString
-highlight = styled (colored Cyan)
+highlight = styled $ colored Cyan

 highlight' :: String -> StyledString
 highlight' = highlight

 styleTime :: String -> StyledString
 styleTime = Styled [SetColor Foreground Vivid Black]
+
+ttyError :: StyledFormat a => a -> StyledString
+ttyError = styled $ colored Red
+
+ttyError' :: String -> StyledString
+ttyError' = ttyError
@@ -36,9 +36,10 @@ packages:
 #
 extra-deps:
  - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881
+  - network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
  - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079
  - tls-1.5.7@sha256:1cc30253a9696b65a9cafc0317fbf09f7dcea15e3a145ed6c9c0e28c632fa23a,6991
-  # below hackage dependancies are to update Aeson to 2.0.3
+  # below hackage dependencies are to update Aeson to 2.0.3
  - OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
  - attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
  - hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
@@ -48,13 +49,12 @@ extra-deps:
  # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
  # - ../simplexmq
  - github: simplex-chat/simplexmq
-    commit: 5c6ec96d6477371d8e617bcc71e6ecbcdd5c78cc
+    commit: a6ec93c38efcc9f5428602461b233aa00d74bc74
  # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
  - github: simplex-chat/aeson
    commit: 3eb66f9a68f103b5f1489382aad89f5712a64db7
  - github: simplex-chat/haskell-terminal
    commit: f708b00009b54890172068f168bf98508ffcd495
-
 #
 # extra-deps: []

@@ -13,6 +13,8 @@ import Control.Concurrent.STM
 import Control.Exception (bracket, bracket_)
 import Control.Monad.Except
 import Data.List (dropWhileEnd)
+import Data.Maybe (fromJust)
+import qualified Data.Text as T
 import Network.Socket
 import Simplex.Chat
 import Simplex.Chat.Controller (ChatConfig (..), ChatController (..))
@@ -20,7 +22,7 @@ import Simplex.Chat.Options
 import Simplex.Chat.Store
 import Simplex.Chat.Terminal
 import Simplex.Chat.Terminal.Output (newChatTerminal)
-import Simplex.Chat.Types (Profile)
+import Simplex.Chat.Types (Profile, User (..))
 import Simplex.Messaging.Agent.Env.SQLite
 import Simplex.Messaging.Agent.RetryInterval
 import Simplex.Messaging.Server (runSMPServerBlocking)
@@ -132,12 +134,16 @@ testChatN ps test = withTmpFiles $ do
 getTermLine :: TestCC -> IO String
 getTermLine = atomically . readTQueue . termQ

-- Use below to echo virtual terminal
+-- Use code below to echo virtual terminal
 -- getTermLine cc = do
 --   s <- atomically . readTQueue $ termQ cc
--   putStrLn s
+--   name <- userName cc
+--   putStrLn $ name <> ": " <> s
 --   pure s

+userName :: TestCC -> IO [Char]
+userName (TestCC ChatController {currentUser} _ _ _ _) = T.unpack . localDisplayName . fromJust <$> readTVarIO currentUser
+
 testChat2 :: Profile -> Profile -> (TestCC -> TestCC -> IO ()) -> IO ()
 testChat2 p1 p2 test = testChatN [p1, p2] test_
  where
@@ -11,7 +11,6 @@ import Control.Concurrent.Async (concurrently_)
 import Control.Concurrent.STM
 import qualified Data.ByteString as B
 import Data.Char (isDigit)
-import Data.Maybe (fromJust)
 import qualified Data.Text as T
 import Simplex.Chat.Controller (ChatController (..))
 import Simplex.Chat.Types (Profile (..), ProfileImage (..), User (..))
@@ -33,10 +32,11 @@ danProfile = Profile {displayName = "dan", fullName = "Daniel", image = Nothing}

 chatTests :: Spec
 chatTests = do
-  describe "direct messages" $
+  describe "direct messages" $ do
    it "add contact and send/receive message" testAddContact
-  describe "SMP servers" $
-    it "get and set SMP servers" testGetSetSMPServers
+    it "direct message quoted replies" testDirectMessageQuotedReply
+    it "direct message update" testDirectMessageUpdate
+    it "direct message delete" testDirectMessageDelete
  describe "chat groups" $ do
    it "add contacts, create group and send/receive messages" testGroup
    it "create and join group with 4 members" testGroup2
@@ -45,6 +45,9 @@ chatTests = do
    it "re-add member in status invited" testGroupReAddInvited
    it "remove contact from group and add again" testGroupRemoveAdd
    it "list groups containing group invitations" testGroupList
+    it "group message quoted replies" testGroupMessageQuotedReply
+    it "group message update" testGroupMessageUpdate
+    it "group message delete" testGroupMessageDelete
  describe "user profiles" $ do
    it "update user profiles and notify contacts" testUpdateProfile
    it "update user profile with image" testUpdateProfileImage
@@ -61,6 +64,8 @@ chatTests = do
    it "deduplicate contact requests with profile change" testDeduplicateContactRequestsProfileChange
    it "reject contact and delete contact link" testRejectContactAndDeleteUserContact
    it "delete connection requests when contact link deleted" testDeleteConnectionRequests
+  describe "SMP servers" $
+    it "get and set SMP servers" testGetSetSMPServers

 testAddContact :: IO ()
 testAddContact =
@@ -73,31 +78,13 @@ testAddContact =
      concurrently_
        (bob <## "alice (Alice): contact is connected")
        (alice <## "bob (Bob): contact is connected")
-      -- empty chats
-      alice #$$> ("/_get chats", [("@bob", "")])
-      alice #$> ("/_get chat @2 count=100", chat, [])
-      bob #$$> ("/_get chats", [("@alice", "")])
-      bob #$> ("/_get chat @2 count=100", chat, [])
-      -- one message
+      chatsEmpty alice bob
      alice #> "@bob hello 🙂"
      bob <# "alice> hello 🙂"
-      alice #$$> ("/_get chats", [("@bob", "hello 🙂")])
-      alice #$> ("/_get chat @2 count=100", chat, [(1, "hello 🙂")])
-      bob #$$> ("/_get chats", [("@alice", "hello 🙂")])
-      bob #$> ("/_get chat @2 count=100", chat, [(0, "hello 🙂")])
-      -- many messages
+      chatsOneMessage alice bob
      bob #> "@alice hi"
      alice <# "bob> hi"
-      alice #$$> ("/_get chats", [("@bob", "hi")])
-      alice #$> ("/_get chat @2 count=100", chat, [(1, "hello 🙂"), (0, "hi")])
-      bob #$$> ("/_get chats", [("@alice", "hi")])
-      bob #$> ("/_get chat @2 count=100", chat, [(0, "hello 🙂"), (1, "hi")])
-      -- pagination
-      alice #$> ("/_get chat @2 after=1 count=100", chat, [(0, "hi")])
-      alice #$> ("/_get chat @2 before=2 count=100", chat, [(1, "hello 🙂")])
-      -- read messages
-      alice #$> ("/_read chat @2 from=1 to=100", id, "ok")
-      bob #$> ("/_read chat @2 from=1 to=100", id, "ok")
+      chatsManyMessages alice bob
      -- test adding the same contact one more time - local name will be different
      alice ##> "/c"
      inv' <- getInvitation alice
@@ -119,18 +106,158 @@ testAddContact =
      alice <## "no contact bob_1"
      alice #$$> ("/_get chats", [("@bob", "hi")])
      bob #$$> ("/_get chats", [("@alice_1", "hi"), ("@alice", "hi")])
+  where
+    chatsEmpty alice bob = do
+      alice #$$> ("/_get chats", [("@bob", "")])
+      alice #$> ("/_get chat @2 count=100", chat, [])
+      bob #$$> ("/_get chats", [("@alice", "")])
+      bob #$> ("/_get chat @2 count=100", chat, [])
+    chatsOneMessage alice bob = do
+      alice #$$> ("/_get chats", [("@bob", "hello 🙂")])
+      alice #$> ("/_get chat @2 count=100", chat, [(1, "hello 🙂")])
+      bob #$$> ("/_get chats", [("@alice", "hello 🙂")])
+      bob #$> ("/_get chat @2 count=100", chat, [(0, "hello 🙂")])
+    chatsManyMessages alice bob = do
+      alice #$$> ("/_get chats", [("@bob", "hi")])
+      alice #$> ("/_get chat @2 count=100", chat, [(1, "hello 🙂"), (0, "hi")])
+      bob #$$> ("/_get chats", [("@alice", "hi")])
+      bob #$> ("/_get chat @2 count=100", chat, [(0, "hello 🙂"), (1, "hi")])
+      -- pagination
+      alice #$> ("/_get chat @2 after=1 count=100", chat, [(0, "hi")])
+      alice #$> ("/_get chat @2 before=2 count=100", chat, [(1, "hello 🙂")])
+      -- read messages
+      alice #$> ("/_read chat @2 from=1 to=100", id, "ok")
+      bob #$> ("/_read chat @2 from=1 to=100", id, "ok")

-testGetSetSMPServers :: IO ()
-testGetSetSMPServers =
+testDirectMessageQuotedReply :: IO ()
+testDirectMessageQuotedReply =
  testChat2 aliceProfile bobProfile $
-    \alice _ -> do
-      alice #$> ("/smp_servers", id, "no custom SMP servers saved")
-      alice #$> ("/smp_servers smp://1234-w==@smp1.example.im", id, "ok")
-      alice #$> ("/smp_servers", id, "smp://1234-w==@smp1.example.im")
-      alice #$> ("/smp_servers smp://2345-w==@smp2.example.im,smp://3456-w==@smp3.example.im:5224", id, "ok")
-      alice #$> ("/smp_servers", id, "smp://2345-w==@smp2.example.im, smp://3456-w==@smp3.example.im:5224")
-      alice #$> ("/smp_servers default", id, "ok")
-      alice #$> ("/smp_servers", id, "no custom SMP servers saved")
+    \alice bob -> do
+      connectUsers alice bob
+      alice ##> "/_send @2 json {\"type\": \"text\", \"text\": \"hello! how are you?\"}"
+      alice <# "@bob hello! how are you?"
+      bob <# "alice> hello! how are you?"
+      bob #> "@alice hi!"
+      alice <# "bob> hi!"
+      bob `send` "> @alice (hello) all good - you?"
+      bob <# "@alice > hello! how are you?"
+      bob <## "      all good - you?"
+      alice <# "bob> > hello! how are you?"
+      alice <## "      all good - you?"
+      bob #$> ("/_get chat @2 count=1", chat', [((1, "all good - you?"), Just (0, "hello! how are you?"))])
+      alice #$> ("/_get chat @2 count=1", chat', [((0, "all good - you?"), Just (1, "hello! how are you?"))])
+      bob `send` ">> @alice (all good) will tell more"
+      bob <# "@alice >> all good - you?"
+      bob <## "      will tell more"
+      alice <# "bob> >> all good - you?"
+      alice <## "      will tell more"
+      bob #$> ("/_get chat @2 count=1", chat', [((1, "will tell more"), Just (1, "all good - you?"))])
+      alice #$> ("/_get chat @2 count=1", chat', [((0, "will tell more"), Just (0, "all good - you?"))])
+
+testDirectMessageUpdate :: IO ()
+testDirectMessageUpdate =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      connectUsers alice bob
+
+      -- msg id 1
+      alice #> "@bob hello 🙂"
+      bob <# "alice> hello 🙂"
+
+      -- msg id 2
+      bob `send` "> @alice (hello) hi alice"
+      bob <# "@alice > hello 🙂"
+      bob <## "      hi alice"
+      alice <# "bob> > hello 🙂"
+      alice <## "      hi alice"
+
+      alice #$> ("/_get chat @2 count=100", chat', [((1, "hello 🙂"), Nothing), ((0, "hi alice"), Just (1, "hello 🙂"))])
+      bob #$> ("/_get chat @2 count=100", chat', [((0, "hello 🙂"), Nothing), ((1, "hi alice"), Just (0, "hello 🙂"))])
+
+      alice #$> ("/_update item @2 1 text hey 👋", id, "item updated")
+      bob <# "alice> [edited] hey 👋"
+
+      alice #$> ("/_get chat @2 count=100", chat', [((1, "hey 👋"), Nothing), ((0, "hi alice"), Just (1, "hello 🙂"))])
+      bob #$> ("/_get chat @2 count=100", chat', [((0, "hey 👋"), Nothing), ((1, "hi alice"), Just (0, "hello 🙂"))])
+
+      -- msg id 3
+      bob `send` "> @alice (hey) hey alice"
+      bob <# "@alice > hey 👋"
+      bob <## "      hey alice"
+      alice <# "bob> > hey 👋"
+      alice <## "      hey alice"
+
+      alice #$> ("/_get chat @2 count=100", chat', [((1, "hey 👋"), Nothing), ((0, "hi alice"), Just (1, "hello 🙂")), ((0, "hey alice"), Just (1, "hey 👋"))])
+      bob #$> ("/_get chat @2 count=100", chat', [((0, "hey 👋"), Nothing), ((1, "hi alice"), Just (0, "hello 🙂")), ((1, "hey alice"), Just (0, "hey 👋"))])
+
+      alice #$> ("/_update item @2 1 text greetings 🤝", id, "item updated")
+      bob <# "alice> [edited] greetings 🤝"
+
+      alice #$> ("/_update item @2 2 text updating bob's message", id, "cannot update this item")
+
+      alice #$> ("/_get chat @2 count=100", chat', [((1, "greetings 🤝"), Nothing), ((0, "hi alice"), Just (1, "hello 🙂")), ((0, "hey alice"), Just (1, "hey 👋"))])
+      bob #$> ("/_get chat @2 count=100", chat', [((0, "greetings 🤝"), Nothing), ((1, "hi alice"), Just (0, "hello 🙂")), ((1, "hey alice"), Just (0, "hey 👋"))])
+
+      bob #$> ("/_update item @2 2 text hey Alice", id, "item updated")
+      alice <# "bob> [edited] > hello 🙂"
+      alice <## "      hey Alice"
+
+      bob #$> ("/_update item @2 3 text greetings Alice", id, "item updated")
+      alice <# "bob> [edited] > hey 👋"
+      alice <## "      greetings Alice"
+
+      alice #$> ("/_get chat @2 count=100", chat', [((1, "greetings 🤝"), Nothing), ((0, "hey Alice"), Just (1, "hello 🙂")), ((0, "greetings Alice"), Just (1, "hey 👋"))])
+      bob #$> ("/_get chat @2 count=100", chat', [((0, "greetings 🤝"), Nothing), ((1, "hey Alice"), Just (0, "hello 🙂")), ((1, "greetings Alice"), Just (0, "hey 👋"))])
+
+testDirectMessageDelete :: IO ()
+testDirectMessageDelete =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      connectUsers alice bob
+
+      -- msg id 1
+      alice #> "@bob hello 🙂"
+      bob <# "alice> hello 🙂"
+
+      -- msg id 2
+      bob `send` "> @alice (hello) hey alic"
+      bob <# "@alice > hello 🙂"
+      bob <## "      hey alic"
+      alice <# "bob> > hello 🙂"
+      alice <## "      hey alic"
+
+      alice #$> ("/_delete item @2 1 internal", id, "item deleted")
+      alice #$> ("/_delete item @2 2 internal", id, "item deleted")
+
+      alice #$$> ("/_get chats", [("@bob", "")])
+      alice #$> ("/_get chat @2 count=100", chat, [])
+
+      alice #$> ("/_update item @2 1 text updating deleted message", id, "cannot update this item")
+      alice #$> ("/_send_quote @2 1 text quoting deleted message", id, "cannot reply to this message")
+
+      bob #$> ("/_update item @2 2 text hey alice", id, "item updated")
+      alice <# "bob> [edited] hey alice"
+
+      alice #$$> ("/_get chats", [("@bob", "hey alice")])
+      alice #$> ("/_get chat @2 count=100", chat, [(0, "hey alice")])
+
+      -- msg id 3
+      bob #> "@alice how are you?"
+      alice <# "bob> how are you?"
+
+      bob #$> ("/_delete item @2 3 broadcast", id, "item deleted")
+      alice <# "bob> [deleted] how are you?"
+
+      alice #$> ("/_delete item @2 1 broadcast", id, "item deleted")
+      bob <# "alice> [deleted] hello 🙂"
+
+      alice #$> ("/_delete item @2 2 broadcast", id, "cannot delete this item")
+      alice #$> ("/_delete item @2 2 internal", id, "item deleted")
+
+      alice #$$> ("/_get chats", [("@bob", "this item is deleted (broadcast)")])
+      alice #$> ("/_get chat @2 count=100", chat, [(0, "this item is deleted (broadcast)")])
+      bob #$$> ("/_get chats", [("@alice", "hey alice")])
+      bob #$> ("/_get chat @2 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((1, "hey alice"), (Just (0, "hello 🙂")))])

 testGroup :: IO ()
 testGroup =
@@ -184,18 +311,7 @@ testGroup =
        (alice <# "#team cath> hey team")
        (bob <# "#team cath> hey team")
      bob <##> cath
-      -- get and read chats
-      alice #$$> ("/_get chats", [("#team", "hey team"), ("@cath", ""), ("@bob", "")])
-      alice #$> ("/_get chat #1 count=100", chat, [(1, "hello"), (0, "hi there"), (0, "hey team")])
-      alice #$> ("/_get chat #1 after=1 count=100", chat, [(0, "hi there"), (0, "hey team")])
-      alice #$> ("/_get chat #1 before=3 count=100", chat, [(1, "hello"), (0, "hi there")])
-      bob #$$> ("/_get chats", [("@cath", "hey"), ("#team", "hey team"), ("@alice", "")])
-      bob #$> ("/_get chat #1 count=100", chat, [(0, "hello"), (1, "hi there"), (0, "hey team")])
-      cath #$$> ("/_get chats", [("@bob", "hey"), ("#team", "hey team"), ("@alice", "")])
-      cath #$> ("/_get chat #1 count=100", chat, [(0, "hello"), (0, "hi there"), (1, "hey team")])
-      alice #$> ("/_read chat #1 from=1 to=100", id, "ok")
-      bob #$> ("/_read chat #1 from=1 to=100", id, "ok")
-      cath #$> ("/_read chat #1 from=1 to=100", id, "ok")
+      getReadChats alice bob cath
      -- list groups
      alice ##> "/gs"
      alice <## "#team"
@@ -230,6 +346,19 @@ testGroup =
      cath ##> "#team hello"
      cath <## "you are no longer a member of the group"
      bob <##> cath
+  where
+    getReadChats alice bob cath = do
+      alice #$$> ("/_get chats", [("#team", "hey team"), ("@cath", ""), ("@bob", "")])
+      alice #$> ("/_get chat #1 count=100", chat, [(1, "hello"), (0, "hi there"), (0, "hey team")])
+      alice #$> ("/_get chat #1 after=1 count=100", chat, [(0, "hi there"), (0, "hey team")])
+      alice #$> ("/_get chat #1 before=3 count=100", chat, [(1, "hello"), (0, "hi there")])
+      bob #$$> ("/_get chats", [("@cath", "hey"), ("#team", "hey team"), ("@alice", "")])
+      bob #$> ("/_get chat #1 count=100", chat, [(0, "hello"), (1, "hi there"), (0, "hey team")])
+      cath #$$> ("/_get chats", [("@bob", "hey"), ("#team", "hey team"), ("@alice", "")])
+      cath #$> ("/_get chat #1 count=100", chat, [(0, "hello"), (0, "hi there"), (1, "hey team")])
+      alice #$> ("/_read chat #1 from=1 to=100", id, "ok")
+      bob #$> ("/_read chat #1 from=1 to=100", id, "ok")
+      cath #$> ("/_read chat #1 from=1 to=100", id, "ok")

 testGroup2 :: IO ()
 testGroup2 =
@@ -543,6 +672,220 @@ testGroupList =
      bob ##> "/gs"
      bob <## "#team"

+testGroupMessageQuotedReply :: IO ()
+testGroupMessageQuotedReply =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      alice #> "#team hello! how are you?"
+      concurrently_
+        (bob <# "#team alice> hello! how are you?")
+        (cath <# "#team alice> hello! how are you?")
+      threadDelay 1000000
+      bob `send` "> #team @alice (hello) hello, all good, you?"
+      bob <# "#team > alice hello! how are you?"
+      bob <## "      hello, all good, you?"
+      concurrently_
+        ( do
+            alice <# "#team bob> > alice hello! how are you?"
+            alice <## "      hello, all good, you?"
+        )
+        ( do
+            cath <# "#team bob> > alice hello! how are you?"
+            cath <## "      hello, all good, you?"
+        )
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "hello! how are you?"), Nothing), ((1, "hello, all good, you?"), Just (0, "hello! how are you?"))])
+      alice #$> ("/_get chat #1 count=100", chat', [((1, "hello! how are you?"), Nothing), ((0, "hello, all good, you?"), Just (1, "hello! how are you?"))])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "hello! how are you?"), Nothing), ((0, "hello, all good, you?"), Just (0, "hello! how are you?"))])
+      bob `send` "> #team bob (hello, all good) will tell more"
+      bob <# "#team > bob hello, all good, you?"
+      bob <## "      will tell more"
+      concurrently_
+        ( do
+            alice <# "#team bob> > bob hello, all good, you?"
+            alice <## "      will tell more"
+        )
+        ( do
+            cath <# "#team bob> > bob hello, all good, you?"
+            cath <## "      will tell more"
+        )
+      bob #$> ("/_get chat #1 count=1", chat', [((1, "will tell more"), Just (1, "hello, all good, you?"))])
+      alice #$> ("/_get chat #1 count=1", chat', [((0, "will tell more"), Just (0, "hello, all good, you?"))])
+      cath #$> ("/_get chat #1 count=1", chat', [((0, "will tell more"), Just (0, "hello, all good, you?"))])
+      threadDelay 1000000
+      cath `send` "> #team bob (hello) hi there!"
+      cath <# "#team > bob hello, all good, you?"
+      cath <## "      hi there!"
+      concurrently_
+        ( do
+            alice <# "#team cath> > bob hello, all good, you?"
+            alice <## "      hi there!"
+        )
+        ( do
+            bob <# "#team cath> > bob hello, all good, you?"
+            bob <## "      hi there!"
+        )
+      cath #$> ("/_get chat #1 count=1", chat', [((1, "hi there!"), Just (0, "hello, all good, you?"))])
+      alice #$> ("/_get chat #1 count=1", chat', [((0, "hi there!"), Just (0, "hello, all good, you?"))])
+      bob #$> ("/_get chat #1 count=1", chat', [((0, "hi there!"), Just (1, "hello, all good, you?"))])
+      alice `send` "> #team (will tell) go on"
+      alice <# "#team > bob will tell more"
+      alice <## "      go on"
+      concurrently_
+        ( do
+            bob <# "#team alice> > bob will tell more"
+            bob <## "      go on"
+        )
+        ( do
+            cath <# "#team alice> > bob will tell more"
+            cath <## "      go on"
+        )
+
+testGroupMessageUpdate :: IO ()
+testGroupMessageUpdate =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      -- msg id 1
+      alice #> "#team hello!"
+      concurrently_
+        (bob <# "#team alice> hello!")
+        (cath <# "#team alice> hello!")
+
+      alice #$> ("/_update item #1 1 text hey 👋", id, "item updated")
+      concurrently_
+        (bob <# "#team alice> [edited] hey 👋")
+        (cath <# "#team alice> [edited] hey 👋")
+
+      alice #$> ("/_get chat #1 count=100", chat', [((1, "hey 👋"), Nothing)])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "hey 👋"), Nothing)])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "hey 👋"), Nothing)])
+
+      threadDelay 1000000
+      -- msg id 2
+      bob `send` "> #team @alice (hey) hi alice"
+      bob <# "#team > alice hey 👋"
+      bob <## "      hi alice"
+      concurrently_
+        ( do
+            alice <# "#team bob> > alice hey 👋"
+            alice <## "      hi alice"
+        )
+        ( do
+            cath <# "#team bob> > alice hey 👋"
+            cath <## "      hi alice"
+        )
+
+      alice #$> ("/_get chat #1 count=100", chat', [((1, "hey 👋"), Nothing), ((0, "hi alice"), Just (1, "hey 👋"))])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "hey 👋"), Nothing), ((1, "hi alice"), Just (0, "hey 👋"))])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "hey 👋"), Nothing), ((0, "hi alice"), Just (0, "hey 👋"))])
+
+      alice #$> ("/_update item #1 1 text greetings 🤝", id, "item updated")
+      concurrently_
+        (bob <# "#team alice> [edited] greetings 🤝")
+        (cath <# "#team alice> [edited] greetings 🤝")
+
+      alice #$> ("/_update item #1 2 text updating bob's message", id, "cannot update this item")
+
+      threadDelay 1000000
+      cath `send` "> #team @alice (greetings) greetings!"
+      cath <# "#team > alice greetings 🤝"
+      cath <## "      greetings!"
+      concurrently_
+        ( do
+            alice <# "#team cath> > alice greetings 🤝"
+            alice <## "      greetings!"
+        )
+        ( do
+            bob <# "#team cath> > alice greetings 🤝"
+            bob <## "      greetings!"
+        )
+
+      alice #$> ("/_get chat #1 count=100", chat', [((1, "greetings 🤝"), Nothing), ((0, "hi alice"), Just (1, "hey 👋")), ((0, "greetings!"), Just (1, "greetings 🤝"))])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "greetings 🤝"), Nothing), ((1, "hi alice"), Just (0, "hey 👋")), ((0, "greetings!"), Just (0, "greetings 🤝"))])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "greetings 🤝"), Nothing), ((0, "hi alice"), Just (0, "hey 👋")), ((1, "greetings!"), Just (0, "greetings 🤝"))])
+
+testGroupMessageDelete :: IO ()
+testGroupMessageDelete =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      -- msg id 1
+      alice #> "#team hello!"
+      concurrently_
+        (bob <# "#team alice> hello!")
+        (cath <# "#team alice> hello!")
+
+      alice #$> ("/_delete item #1 1 internal", id, "item deleted")
+
+      alice #$> ("/_get chat #1 count=100", chat, [])
+      bob #$> ("/_get chat #1 count=100", chat, [(0, "hello!")])
+      cath #$> ("/_get chat #1 count=100", chat, [(0, "hello!")])
+
+      alice #$> ("/_update item #1 1 text updating deleted message", id, "cannot update this item")
+      alice #$> ("/_send_quote #1 1 text quoting deleted message", id, "cannot reply to this message")
+
+      threadDelay 1000000
+      -- msg id 2
+      bob `send` "> #team @alice (hello) hi alic"
+      bob <# "#team > alice hello!"
+      bob <## "      hi alic"
+      concurrently_
+        ( do
+            alice <# "#team bob> > alice hello!"
+            alice <## "      hi alic"
+        )
+        ( do
+            cath <# "#team bob> > alice hello!"
+            cath <## "      hi alic"
+        )
+
+      alice #$> ("/_get chat #1 count=100", chat', [((0, "hi alic"), Just (1, "hello!"))])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "hello!"), Nothing), ((1, "hi alic"), Just (0, "hello!"))])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "hello!"), Nothing), ((0, "hi alic"), Just (0, "hello!"))])
+
+      alice #$> ("/_delete item #1 1 broadcast", id, "item deleted")
+      concurrently_
+        (bob <# "#team alice> [deleted] hello!")
+        (cath <# "#team alice> [deleted] hello!")
+
+      alice #$> ("/_delete item #1 2 internal", id, "item deleted")
+
+      alice #$> ("/_get chat #1 count=100", chat', [])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((1, "hi alic"), Just (0, "hello!"))])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((0, "hi alic"), Just (0, "hello!"))])
+
+      bob #$> ("/_update item #1 2 text hi alice", id, "item updated")
+      concurrently_
+        (alice <# "#team bob> [edited] hi alice")
+        ( do
+            cath <# "#team bob> [edited] > alice hello!"
+            cath <## "      hi alice"
+        )
+
+      alice #$> ("/_get chat #1 count=100", chat', [((0, "hi alice"), Nothing)])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((1, "hi alice"), Just (0, "hello!"))])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((0, "hi alice"), Just (0, "hello!"))])
+
+      threadDelay 1000000
+      -- msg id 3
+      cath #> "#team how are you?"
+      concurrently_
+        (alice <# "#team cath> how are you?")
+        (bob <# "#team cath> how are you?")
+
+      cath #$> ("/_delete item #1 3 broadcast", id, "item deleted")
+      concurrently_
+        (alice <# "#team cath> [deleted] how are you?")
+        (bob <# "#team cath> [deleted] how are you?")
+
+      alice #$> ("/_delete item #1 2 broadcast", id, "cannot delete this item")
+      alice #$> ("/_delete item #1 2 internal", id, "item deleted")
+
+      alice #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing)])
+      bob #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((1, "hi alice"), Just (0, "hello!")), ((0, "this item is deleted (broadcast)"), Nothing)])
+      cath #$> ("/_get chat #1 count=100", chat', [((0, "this item is deleted (broadcast)"), Nothing), ((0, "hi alice"), Just (0, "hello!"))])
+
 testUpdateProfile :: IO ()
 testUpdateProfile =
  testChat3 aliceProfile bobProfile cathProfile $
@@ -590,9 +933,14 @@ testUpdateProfileImage =
  testChat2 aliceProfile bobProfile $
    \alice bob -> do
      connectUsers alice bob
-      -- Note we currently don't support removing profile image.
      alice ##> "/profile_image data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="
      alice <## "profile image updated"
+      alice ##> "/profile_image"
+      alice <## "profile image removed"
+      alice ##> "/_profile {\"displayName\": \"alice2\", \"fullName\": \"\"}"
+      alice <## "user profile is changed to alice2 (your contacts are notified)"
+      bob <## "contact alice changed to alice2"
+      bob <## "use @alice2 <message> to send messages"
      (bob </)

 testFileTransfer :: IO ()
@@ -952,6 +1300,18 @@ testDeleteConnectionRequests = testChat3 aliceProfile bobProfile cathProfile $
    cath ##> ("/c " <> cLink')
    alice <#? cath

+testGetSetSMPServers :: IO ()
+testGetSetSMPServers =
+  testChat2 aliceProfile bobProfile $
+    \alice _ -> do
+      alice #$> ("/smp_servers", id, "no custom SMP servers saved")
+      alice #$> ("/smp_servers smp://1234-w==@smp1.example.im", id, "ok")
+      alice #$> ("/smp_servers", id, "smp://1234-w==@smp1.example.im")
+      alice #$> ("/smp_servers smp://2345-w==@smp2.example.im,smp://3456-w==@smp3.example.im:5224", id, "ok")
+      alice #$> ("/smp_servers", id, "smp://2345-w==@smp2.example.im, smp://3456-w==@smp3.example.im:5224")
+      alice #$> ("/smp_servers default", id, "ok")
+      alice #$> ("/smp_servers", id, "no custom SMP servers saved")
+
 startFileTransfer :: TestCC -> TestCC -> IO ()
 startFileTransfer alice bob = do
  alice #> "/f @bob ./tests/fixtures/test.jpg"
@@ -1042,9 +1402,6 @@ cc1 <##> cc2 = do
  cc2 #> ("@" <> name1 <> " hey")
  cc1 <# (name2 <> "> hey")

-userName :: TestCC -> IO [Char]
-userName (TestCC ChatController {currentUser} _ _ _ _) = T.unpack . localDisplayName . fromJust <$> readTVarIO currentUser
-
 (##>) :: TestCC -> String -> IO ()
 cc ##> cmd = do
  cc `send` cmd
@@ -1061,7 +1418,10 @@ cc #$> (cmd, f, res) = do
  (f <$> getTermLine cc) `shouldReturn` res

 chat :: String -> [(Int, String)]
-chat = read
+chat = map fst . chat'
+
+chat' :: String -> [((Int, String), Maybe (Int, String))]
+chat' = read

 (#$$>) :: TestCC -> (String, [(String, String)]) -> Expectation
 cc #$$> (cmd, res) = do
@@ -16,6 +16,7 @@ markdownTests = do
  textWithUri
  textWithEmail
  textWithPhone
+  multilineMarkdownList

 textFormat :: Spec
 textFormat = describe "text format (bold)" do
@@ -180,3 +181,13 @@ textWithPhone = describe "text with Phone" do
    parseMarkdown "test 077777 test" `shouldBe` "test 077777 test"
  it "ignored as markdown (double spaces)" $
    parseMarkdown "test 07777  777  777 test" `shouldBe` "test 07777  777  777 test"
+
+uri' :: Text -> FormattedText
+uri' = FormattedText $ Just Uri
+
+multilineMarkdownList :: Spec
+multilineMarkdownList = describe "multiline markdown" do
+  it "correct markdown" do
+    parseMaybeMarkdownList "http://simplex.chat\nhttp://app.simplex.chat" `shouldBe` Just [uri' "http://simplex.chat", "\n", uri' "http://app.simplex.chat"]
+  it "no markdown" do
+    parseMaybeMarkdownList "not a\nmarkdown" `shouldBe` Nothing
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JRoberts	7f7abe1c62	terminal: version 1.4.1 (#486 )	2022-03-31 16:08:07 +04:00
JRoberts	f1492f8889	core: update simplexmq hash (pragmas) (#484 )	2022-03-31 15:32:42 +04:00
JRoberts	4c6800f1ff	android: change font (#426 )	2022-03-30 23:35:36 +04:00
Evgeny Poberezkin	b6c578ca77	ios: fix missing profile image on the first received item in the group (#483 )	2022-03-30 20:04:25 +01:00
JRoberts	f388512592	mobile: message delete (#480 ) * mobile: message delete * ios * android api * meta * android * new ios libs * bug fixes * adjust alert * fix deleted item upsert * change border color for ios * format * android - red button * ios: deleted item design * android: deleted item design * android alert msg Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2022-03-30 20:37:47 +04:00
Evgeny Poberezkin	8574674c2d	android: notice about background service (#481 ) * android: notice about background service * update alert text	2022-03-30 12:33:31 +01:00
Evgeny Poberezkin	1b7cee9fcf	ios: update lib and build version 31 / 1.4	2022-03-30 09:02:45 +01:00
Evgeny Poberezkin	5e964cf7e9	mobile: show group member images in the chat (#473 ) * mobile: show group member images in the chat * improve layout for group chat * android: show member images in group chat * do not repeat member name in group messages	2022-03-30 08:57:42 +01:00
Evgeny Poberezkin	8768d03e57	Merge branch 'stable'	2022-03-30 08:19:38 +01:00
Evgeny Poberezkin	75dfd725f4	android: build 19 (v1.4)	2022-03-30 08:18:08 +01:00
Evgeny Poberezkin	ea343b634d	core: fix multiline mardown (#478 ) * core: fix multiline mardown * add test	2022-03-29 13:18:44 +01:00
Evgeny Poberezkin	41a2e0b1d5	Merge branch 'stable'	2022-03-29 12:54:42 +01:00
Evgeny Poberezkin	e52e516f5c	core: update simplexmq (PING failure resets TCP connection, increase timeout to 5 sec)	2022-03-29 12:49:47 +01:00
Evgeny Poberezkin	ea29f93fb6	core: update simplexmq (PING failure resets TCP connection, increase timeout to 5 sec)	2022-03-29 11:36:52 +01:00
Evgeny Poberezkin	eaa2f4cf04	terminal: send broadcast messages (#477 )	2022-03-29 08:53:30 +01:00
Evgeny Poberezkin	954f729a30	update simplexmq (parallel resubscriptions)	2022-03-28 22:01:52 +01:00
JRoberts	d35e7da3e4	trigger new CI job	2022-03-28 22:27:05 +04:00
JRoberts	692f37daa2	core: message delete (#470 )	2022-03-28 20:35:57 +04:00
Evgeny Poberezkin	e0f4855d0d	android: version 1.5 (18) - includes foreground service	2022-03-27 12:16:05 +01:00
Evgeny Poberezkin	a11784c615	android: foreground service to receive messages (#454 ) * android: foreground service to receive messages * android: fix duplicate chat (caused by persistent state of the service) * option to turn off background service * fix: foreground service failing to start when the new user is created * remove unused background manager	2022-03-26 16:49:08 +00:00
JRoberts	922ec2c045	Merge pull request #476 from simplex-chat/master (v1.4.0 terminal app)	2022-03-26 19:25:03 +04:00
JRoberts	262c999e5c	terminal: version 1.4.0	2022-03-26 18:22:45 +04:00
Evgeny Poberezkin	14a5b680d7	core: update simplexmq (#475 ) * core: update simplexmq * update sha256map.nix	2022-03-26 13:47:47 +00:00
Evgeny Poberezkin	a316a95754	android: version 1.4 (17)	2022-03-26 13:25:01 +00:00
Evgeny Poberezkin	a81de493fe	ios: version 1.4 (30)	2022-03-26 12:23:14 +00:00
JRoberts	bdb3bc0bd7	mobile: hide edit button (#474 )	2022-03-26 15:08:42 +04:00
JRoberts	8b2ae2d426	terminal: version 1.3.4	2022-03-26 10:49:36 +04:00
Evgeny Poberezkin	013a7322d2	ios: fix chat scrolling crashing the app (#472 )	2022-03-25 20:02:40 +00:00
Evgeny Poberezkin	e92f960a87	clean-up logo (#471 )	2022-03-25 19:34:04 +00:00
JRoberts	0b45ddfc79	mobile: message update (restore #460 ) (#469 )	2022-03-25 22:26:05 +04:00
JRoberts	897c64e0ba	core: use existential connection request type in file invitations to allow switching groups to "contact" requests (restore #464 ) (#468 )	2022-03-25 22:23:51 +04:00
JRoberts	26558dfaca	profile images (restore #423 ) (#466 ) * core: configurable smp servers (#366) * core: update simplexmq hash * core: update simplexmq hash (fix SMPServer json encoding) * core: fix crashing on supplying duplicate SMP servers * core: update simplexmq hash (remove SMPServer FromJSON) * core: update simplexmq hash (merged master) * core: profile images (#384) * adding initial RFC * adding migration SQL * update RFC * linting * Apply suggestions from code review Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> * refine RFC * add avatars db migration to Store.hs * initial chages to have images in users/groups * fix protocol tests * update SQL & MobileTests * minor bug fixes * add missing comma * fix query error * refactor and update functions * bug fixes + testing * update to parse base64 web format images * fix parsing and use valid padded base64 encoded image * fix typos * respose to and suggestions from review * fix: typo * refactor: avatars -> profile_images * fix: typo * swap updateProfile parameters * remove TODO Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> * initial changes to show profile images * simple set up complete * add initial shape of image getting (needs work) * redesign * ios, android: configurable smp servers (only model and api for android) (#392) * example image picker placed in edit profile screen * tidy up and allow encoding * more tidying * update bottom modal bar * v0.1 UI for upload ready * add api calls * refactor edit profile screen * complete the refactor with connection back to api * linting * update encoding for hs compat * no line wrapping and resize image * refactor and tidy up for cleanest compatability with haskell * ios: UI for editing images * crop image to square * update profile edit layout * fixing image preview orientation etc * allow expandable image in profile view * handle case where user exits camera rather than take image * housekeeping on when to call apiUpdateProfileImage * improve scaling of large image * linting * spacing * fix padding * revert whitespace change * tidy up, one remaining issue * refactor to get parsing working * add missed change * use custom modal in user profile * fix image size after scaling * scale image iteratively * add filter * update profile editing view * ios: edit profile image (TODO aspect ratio) * ios: UI to manage profile images * ios: use new profile api * android: use new api to update profile * android: scroll profile view up when editing * revert change * reduce profile image resolution to 104px to fit in 12.5kb Co-authored-by: IanRDavies <ian_davies_@hotmail.co.uk> Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2022-03-25 22:13:01 +04:00
Evgeny Poberezkin	ff32a44345	trigger new CI job	2022-03-24 11:01:22 +00:00
Evgeny Poberezkin	d4925b7cdd	core: api to update user profile in one request (#461 )	2022-03-23 20:52:00 +00:00
Evgeny Poberezkin	3c81a44273	message update and delete (#451 ) * core: message update and delete, protocol and command syntax * edit logic wip * message updates * revert project.pbxproj * corrections, dependency, editable Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>	2022-03-23 15:37:51 +04:00
Evgeny Poberezkin	319b4dc841	bump haskell.nix (#459 ) Co-authored-by: Moritz Angermann <moritz.angermann@gmail.com>	2022-03-23 08:47:36 +00:00
Evgeny Poberezkin	71483b0fc4	update simplexmq	2022-03-22 08:07:52 +00:00
Evgeny Poberezkin	366b84d3fa	use simplexmq with TCP keep-alive instead of SMP PINGs (#457 ) * use simplexmq with TCP keep-alive instead of SMP PINGs * update simplexmq * sha256nix	2022-03-21 17:15:25 +00:00
Evgeny Poberezkin	22dc68ff4e	ios: update dummy.m to work with x86 sim, upgrade libraries (#458 ) * ios: update dummy.m to work with x86 sim * add condition for CPU arch to dummy.m	2022-03-21 08:43:34 +00:00
Evgeny Poberezkin	4903966bea	update nix dependencies config	2022-03-20 16:41:04 +00:00
Evgeny Poberezkin	f43c462907	ios: load chat from db synchronously to avoid occasional empty chats (#453 )	2022-03-19 17:20:27 +00:00
Evgeny Poberezkin	490dc17571	Merge PR #450 - v1.3 release merge v1.3 to stable	2022-03-19 09:17:35 +00:00
Evgeny Poberezkin	b57a77c8f0	Merge branch 'stable'	2022-03-19 09:05:30 +00:00
Evgeny Poberezkin	fe0e5e8b89	terminal: version 1.3.3 (#447 ) * terminal: show version from .cabal file * update welcome message * terminal: helo on message quotes * terminal: allow replies in groups without specifying a member * core: update version to 1.3.3	2022-03-19 09:04:53 +00:00
Evgeny Poberezkin	3340bea150	core: api to remove profile image (#448 )	2022-03-19 07:42:54 +00:00
Evgeny Poberezkin	0e73697ea4	mobile: show app version/build, update settings, update build number (16: android, 28: ios) (#445 )	2022-03-18 09:23:01 +00:00
sh	4fcbec49c9	readme: add fdroid badge (#446 )	2022-03-18 08:21:36 +00:00
Evgeny Poberezkin	01994d8c6a	android: fix message entry size after sending emoji, build 15	2022-03-17 18:01:47 +00:00
Evgeny Poberezkin	31de7fd0ee	mobile: update version/build 1.3 (ios: 27, android 14)	2022-03-17 10:34:31 +00:00
Evgeny Poberezkin	744c451927	mobile: message actions (reply, share, copy) (#431 ) * ios: add context menu to messages * ios: UI for replies with quotes * fix: scrolling crashing in chat * ios: UI for message replies with quotes * android: UI for message replies * android: messages with quotes * android: update imports * android: refactor ChatItemView * remove comments	2022-03-17 09:42:59 +00:00
Evgeny Poberezkin	148474e1ba	core: change quoted messages types/protocol (#443 ) * core: change quoted messages types/protocol * remove comments and unused field * rename CIQuote type * change type for quote direction to allow unknown group member, use QuotedMsg to save received chat item * change queries of quoted items when the sending group member is known * refactor * fix: make ciQuote polymorphic	2022-03-16 13:20:47 +00:00
Evgeny Poberezkin	d4765bcfec	Merge branch 'stable'	2022-03-14 21:04:05 +00:00
Evgeny Poberezkin	e4ea2035ff	android: fix app crashing on opening chats, build 12 (#439 )	2022-03-14 21:03:36 +00:00
Evgeny Poberezkin	3a28bacf14	Merge branch 'stable'	2022-03-14 21:01:54 +00:00
Mark Aleksander Hil	102fdf3b18	mobile: update copy, fix typo (#440 ) * Updated copy and fixed typo * Updated copy and fixed typo	2022-03-14 20:58:19 +00:00
Evgeny Poberezkin	1f539fc8be	hide secrets in notifications, closes #416 (#424 ) * terminal: hide secrets in notifications #416 * ios: hide secrets in notifications * android: hide secrets in notifications	2022-03-13 20:13:47 +00:00
Evgeny Poberezkin	806f417e99	message replies and chat item references (#394 ) * rfc for message replies and chat item references * update replies rfc * save received/sent shared message ids, migration and types for replies * include reply/forward into MsgContent type * add sharedMsgId to CIMeta * save/get shared_msg_id to/from chat items table * parameterize CIRef by chat type * add CIRef to ChatItem when it is read from the db * terminal command to send message replies * include quoted content into chat items * quoted message direction in direct chats (TODO test) * test for replies with quotes to group messages - own and others * split MsgContainer from MsgContent * make quoting usable in the terminal * add formattedText to quotes * rename migration * update JSON encoding for MsgContainer * allow quoted replies to messages from clients not supporting it/not sending msg IDs * update rfc * fix group replies * add APISendMessageQuote and use it for terminal commands * change how quoted messages are shown in groups	2022-03-13 19:34:03 +00:00
IanRDavies	6c04184a9c	core: filter contacts on connection status before broadcasting profile updates (#430 ) * filter contacts on connection status before broadcasting profile updates * catch and report errors when notifying contacts about profile updates Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2022-03-12 20:57:11 +00:00