diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bb73ff7f18..0678c24ad77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ All user visible changes to this project will be documented in this file. This p
     - Chat page:
         - Redesigned info and call messages. ([#357])
         - Redesigned file attachments. ([#362])
+        - Message timestamps. ([#399])
     - Media panel:
         - Position and size persistence. ([#270], [#264])
         - Proportionally resizing secondary panel. ([#393], [#356], [#258])
@@ -64,6 +65,7 @@ All user visible changes to this project will be documented in this file. This p
 [#380]: /../../pull/380
 [#388]: /../../pull/388
 [#393]: /../../pull/393
+[#399]: /../../pull/399
 [#403]: /../../pull/403
 
 
diff --git a/assets/l10n/en-US.ftl b/assets/l10n/en-US.ftl
index dc23dfe5e04..75eb49c9048 100644
--- a/assets/l10n/en-US.ftl
+++ b/assets/l10n/en-US.ftl
@@ -378,6 +378,7 @@ label_app_background = Application background
 label_application = Application
 label_are_you_sure_no = No
 label_are_you_sure_yes = Yes
+label_as_timeline = As timeline
 label_attachments = [{$count} { $count ->
     [1] attachment
     *[other] attachments
@@ -476,6 +477,7 @@ label_direct_chat_link_in_chat_description =
     - send messages to group chat,
     - make calls
 label_disabled = Disabled
+label_display_timestamps = Display time stamps
 label_download = Download
 label_download_application = Download application
 label_draft = Draft
@@ -522,6 +524,7 @@ label_hint_drag_n_drop_video =
 label_hint_from_gapopa = Hint from Gapopa
 label_image_downloaded = Image downloaded.
 label_image_saved_to_gallery = Image saved to gallery.
+label_in_message = In message
 label_incoming_call = Incoming call
 label_introduction_description =
     Password is not set. Access to an account without a password is retained for one year from the time the account was created or until:
@@ -672,6 +675,7 @@ label_subtitle_participants = participants
 label_tab_chats = Chats
 label_tab_contacts = Contacts
 label_tab_menu = Menu
+label_timeline_style = Timeline style
 label_transition_count = Transitions: {$count}
 label_typing = Typing
 label_unconfirmed = Unconfirmed
diff --git a/assets/l10n/ru-RU.ftl b/assets/l10n/ru-RU.ftl
index cdd07795269..a1e2fddd33d 100644
--- a/assets/l10n/ru-RU.ftl
+++ b/assets/l10n/ru-RU.ftl
@@ -392,6 +392,7 @@ label_app_background = Фон приложения
 label_application = Приложение
 label_are_you_sure_no = Нет
 label_are_you_sure_yes = Да
+label_as_timeline = Как таймлайн
 label_attachments = [{$count} { $count ->
     [1] прикрепление
     [few] прикрепления
@@ -492,6 +493,7 @@ label_direct_chat_link_in_chat_description =
     - отправлять сообщения в чат группы,
     - совершать звонки
 label_disabled = Отключены
+label_display_timestamps = Отображать метки времени
 label_download = Скачать
 label_download_application = Скачать приложение
 label_draft = Черновик
@@ -538,6 +540,7 @@ label_hint_drag_n_drop_video =
 label_hint_from_gapopa = Подсказка от Gapopa
 label_image_downloaded = Изображение загружено.
 label_image_saved_to_gallery = Изображение сохранено в галерею.
+label_in_message = В сообщении
 label_incoming_call = Входящий звонок
 label_introduction_description =
     Пароль не задан. Доступ к аккаунту без пароля сохраняется в течении одного года с момента создания аккаунта или пока:
@@ -692,6 +695,7 @@ label_subtitle_participants = участников
 label_tab_chats = Чаты
 label_tab_contacts = Контакты
 label_tab_menu = Меню
+label_timeline_style = Стиль метки времени
 label_transition_count = Переходов: {$count}
 label_typing = Печатает
 label_unconfirmed = Неподтвержденный
diff --git a/lib/domain/model/application_settings.dart b/lib/domain/model/application_settings.dart
index 5bf55495489..1693b4017e2 100644
--- a/lib/domain/model/application_settings.dart
+++ b/lib/domain/model/application_settings.dart
@@ -34,6 +34,7 @@ class ApplicationSettings extends HiveObject {
     this.showDragAndDropButtonsHint = false,
     this.sortContactsByName = true,
     this.loadImages = true,
+    this.timelineEnabled = false,
   });
 
   /// Indicator whether [OngoingCall]s are preferred to be displayed in the
@@ -75,4 +76,9 @@ class ApplicationSettings extends HiveObject {
   /// Indicator whether [ImageAttachment]s should be loaded automatically.
   @HiveField(8)
   bool loadImages;
+
+  /// Indicator whether [ChatItem.at] labels should be displayed as a timeline
+  /// in a [Chat].
+  @HiveField(9)
+  bool timelineEnabled;
 }
diff --git a/lib/domain/repository/settings.dart b/lib/domain/repository/settings.dart
index 200cde4387e..c8492f798df 100644
--- a/lib/domain/repository/settings.dart
+++ b/lib/domain/repository/settings.dart
@@ -84,4 +84,7 @@ abstract class AbstractSettingsRepository {
   /// Returns the [Rect] preferences of an [OngoingCall] happening in the
   /// specified [Chat].
   Rect? getCallRect(ChatId id);
+
+  /// Sets the [ApplicationSettings.timelineEnabled] value.
+  Future<void> setTimelineEnabled(bool enabled);
 }
diff --git a/lib/provider/hive/application_settings.dart b/lib/provider/hive/application_settings.dart
index 11e64ffd108..ab8eec5aa17 100644
--- a/lib/provider/hive/application_settings.dart
+++ b/lib/provider/hive/application_settings.dart
@@ -92,4 +92,11 @@ class ApplicationSettingsHiveProvider
         0,
         (box.get(0) ?? ApplicationSettings())..loadImages = enabled,
       );
+
+  /// Stores a new [enabled] value of [ApplicationSettings.timelineEnabled]
+  /// to [Hive].
+  Future<void> setTimelineEnabled(bool enabled) => putSafe(
+        0,
+        (box.get(0) ?? ApplicationSettings())..timelineEnabled = enabled,
+      );
 }
diff --git a/lib/routes.dart b/lib/routes.dart
index 14e73370e0c..552fa750e63 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -101,6 +101,7 @@ enum ProfileTab {
   signing,
   link,
   background,
+  chats,
   calls,
   media,
   notifications,
diff --git a/lib/store/chat_rx.dart b/lib/store/chat_rx.dart
index e4fd694c753..4c391ecfb7c 100644
--- a/lib/store/chat_rx.dart
+++ b/lib/store/chat_rx.dart
@@ -1223,6 +1223,8 @@ class AwaitableTimer {
     _timer = Timer(d, () async {
       try {
         _completer.complete(await callback());
+      } on StateError {
+        // No-op, as [Future] is allowed to be completed.
       } catch (e, stackTrace) {
         _completer.completeError(e, stackTrace);
       }
diff --git a/lib/store/settings.dart b/lib/store/settings.dart
index 649e59ad850..7f046a9f196 100644
--- a/lib/store/settings.dart
+++ b/lib/store/settings.dart
@@ -150,6 +150,10 @@ class SettingsRepository extends DisposableInterface
   @override
   Rect? getCallRect(ChatId id) => _callRectLocal.get(id);
 
+  @override
+  Future<void> setTimelineEnabled(bool enabled) =>
+      _settingsLocal.setTimelineEnabled(enabled);
+
   /// Initializes [MediaSettingsHiveProvider.boxEvents] subscription.
   Future<void> _initMediaSubscription() async {
     _mediaSubscription = StreamIterator(_mediaLocal.boxEvents);
diff --git a/lib/ui/page/home/page/chat/view.dart b/lib/ui/page/home/page/chat/view.dart
index 16d4a7196bd..2841fc683c9 100644
--- a/lib/ui/page/home/page/chat/view.dart
+++ b/lib/ui/page/home/page/chat/view.dart
@@ -282,24 +282,26 @@ class _ChatViewState extends State<ChatView>
                       ],
                     ),
                     body: Listener(
-                      onPointerSignal: (s) {
-                        if (s is PointerScrollEvent) {
-                          if ((s.scrollDelta.dy.abs() < 3 &&
-                                  s.scrollDelta.dx.abs() > 3) ||
-                              c.isHorizontalScroll.value) {
-                            double value =
-                                _animation.value + s.scrollDelta.dx / 100;
-                            _animation.value = value.clamp(0, 1);
-
-                            if (_animation.value == 0 ||
-                                _animation.value == 1) {
-                              _resetHorizontalScroll(c, 10.milliseconds);
-                            } else {
-                              _resetHorizontalScroll(c);
+                      onPointerSignal: c.settings.value?.timelineEnabled == true
+                          ? (s) {
+                              if (s is PointerScrollEvent) {
+                                if ((s.scrollDelta.dy.abs() < 3 &&
+                                        s.scrollDelta.dx.abs() > 3) ||
+                                    c.isHorizontalScroll.value) {
+                                  double value =
+                                      _animation.value + s.scrollDelta.dx / 100;
+                                  _animation.value = value.clamp(0, 1);
+
+                                  if (_animation.value == 0 ||
+                                      _animation.value == 1) {
+                                    _resetHorizontalScroll(c, 10.milliseconds);
+                                  } else {
+                                    _resetHorizontalScroll(c);
+                                  }
+                                }
+                              }
                             }
-                          }
-                        }
-                      },
+                          : null,
                       onPointerPanZoomUpdate: (s) {
                         if (c.scrollOffset.dx.abs() < 7 &&
                             c.scrollOffset.dy.abs() < 7) {
@@ -323,7 +325,8 @@ class _ChatViewState extends State<ChatView>
                       child: RawGestureDetector(
                         behavior: HitTestBehavior.translucent,
                         gestures: {
-                          if (c.isSelecting.isFalse)
+                          if (c.settings.value?.timelineEnabled == true &&
+                              c.isSelecting.isFalse)
                             AllowMultipleHorizontalDragGestureRecognizer:
                                 GestureRecognizerFactoryWithHandlers<
                                     AllowMultipleHorizontalDragGestureRecognizer>(
@@ -613,6 +616,7 @@ class _ChatViewState extends State<ChatView>
             user: u.data,
             getUser: c.getUser,
             animation: _animation,
+            timestamp: c.settings.value?.timelineEnabled != true,
             onHide: () => c.hideChatItem(e.value),
             onDelete: () => c.deleteMessage(e.value),
             onReply: () {
@@ -622,9 +626,13 @@ class _ChatViewState extends State<ChatView>
                 c.send.replied.insert(0, e.value);
               }
             },
-            onCopy: c.selection.value?.plainText.isNotEmpty == true
-                ? (_) => c.copyText(c.selection.value!.plainText)
-                : c.copyText,
+            onCopy: (text) {
+              if (c.selection.value?.plainText.isNotEmpty == true) {
+                c.copyText(c.selection.value!.plainText);
+              } else {
+                c.copyText(text);
+              }
+            },
             onRepliedTap: (q) async {
               if (q.original != null) {
                 await c.animateTo(q.original!.id);
@@ -665,6 +673,7 @@ class _ChatViewState extends State<ChatView>
             user: u.data,
             getUser: c.getUser,
             animation: _animation,
+            timestamp: c.settings.value?.timelineEnabled != true,
             onHide: () async {
               final List<Future> futures = [];
 
@@ -714,9 +723,13 @@ class _ChatViewState extends State<ChatView>
                 }
               }
             },
-            onCopy: c.selection.value?.plainText.isNotEmpty == true
-                ? (_) => c.copyText(c.selection.value!.plainText)
-                : c.copyText,
+            onCopy: (text) {
+              if (c.selection.value?.plainText.isNotEmpty == true) {
+                c.copyText(c.selection.value!.plainText);
+              } else {
+                c.copyText(text);
+              }
+            },
             onGallery: c.calculateGallery,
             onEdit: () => c.editMessage(element.note.value!.value),
             onDrag: (d) => c.isItemDragged.value = d,
diff --git a/lib/ui/page/home/page/chat/widget/chat_forward.dart b/lib/ui/page/home/page/chat/widget/chat_forward.dart
index f9389883a8e..9a62333a75d 100644
--- a/lib/ui/page/home/page/chat/widget/chat_forward.dart
+++ b/lib/ui/page/home/page/chat/widget/chat_forward.dart
@@ -54,6 +54,7 @@ import '/util/platform_utils.dart';
 import 'animated_offset.dart';
 import 'chat_item.dart';
 import 'message_info/view.dart';
+import 'message_timestamp.dart';
 import 'selection_text.dart';
 import 'swipeable_status.dart';
 
@@ -69,8 +70,9 @@ class ChatForwardWidget extends StatefulWidget {
     this.reads = const [],
     this.loadImages = true,
     this.user,
-    this.getUser,
     this.animation,
+    this.timestamp = true,
+    this.getUser,
     this.onHide,
     this.onDelete,
     this.onReply,
@@ -93,17 +95,11 @@ class ChatForwardWidget extends StatefulWidget {
   /// [ChatMessage] attached to these [forwards] as a note.
   final Rx<Rx<ChatItem>?> note;
 
-  /// [UserId] of the authenticated [MyUser].
-  final UserId me;
-
   /// [UserId] of the [user] who posted these [forwards].
   final UserId authorId;
 
-  /// Optional animation controlling a [SwipeableStatus].
-  final AnimationController? animation;
-
-  /// [User] posted these [forwards].
-  final RxUser? user;
+  /// [UserId] of the authenticated [MyUser].
+  final UserId me;
 
   /// [LastChatRead] to display under this [ChatItem].
   final Iterable<LastChatRead> reads;
@@ -112,6 +108,16 @@ class ChatForwardWidget extends StatefulWidget {
   /// fetched as soon as they are displayed, if any.
   final bool loadImages;
 
+  /// [User] posted these [forwards].
+  final RxUser? user;
+
+  /// Optional animation controlling a [SwipeableStatus].
+  final AnimationController? animation;
+
+  /// Indicator whether a [ChatItem.at] should be displayed within this
+  /// [ChatForwardWidget].
+  final bool timestamp;
+
   /// Callback, called when a [RxUser] identified by the provided [UserId] is
   /// required.
   final Future<RxUser?> Function(UserId userId)? getUser;
@@ -318,7 +324,12 @@ class _ChatForwardWidgetState extends State<ChatForwardWidget> {
                                   ? const Radius.circular(15)
                                   : Radius.zero,
                             ),
-                            child: _forwardedMessage(e, menu),
+                            child: _forwardedMessage(
+                              e,
+                              menu,
+                              timestamp: widget.timestamp &&
+                                  i == widget.forwards.length - 1,
+                            ),
                           ),
                         ),
                       ],
@@ -334,7 +345,11 @@ class _ChatForwardWidgetState extends State<ChatForwardWidget> {
   }
 
   /// Returns a visual representation of the provided [forward].
-  Widget _forwardedMessage(Rx<ChatItem> forward, bool menu) {
+  Widget _forwardedMessage(
+    Rx<ChatItem> forward,
+    bool menu, {
+    bool timestamp = false,
+  }) {
     return Obx(() {
       ChatForward msg = forward.value as ChatForward;
       ChatItemQuote quote = msg.quote;
@@ -366,15 +381,17 @@ class _ChatForwardWidgetState extends State<ChatForwardWidget> {
                 opacity: _isRead || !_fromMe ? 1 : 0.55,
                 child: Padding(
                   padding: const EdgeInsets.fromLTRB(0, 4, 0, 4),
-                  child: Column(
-                    children: files
-                        .map(
-                          (e) => ChatItemWidget.fileAttachment(
-                            e,
-                            onFileTap: (a) => widget.onFileTap?.call(msg, a),
-                          ),
-                        )
-                        .toList(),
+                  child: SelectionContainer.disabled(
+                    child: Column(
+                      children: files
+                          .map(
+                            (e) => ChatItemWidget.fileAttachment(
+                              e,
+                              onFileTap: (a) => widget.onFileTap?.call(msg, a),
+                            ),
+                          )
+                          .toList(),
+                    ),
                   ),
                 ),
               ),
@@ -514,64 +531,92 @@ class _ChatForwardWidgetState extends State<ChatForwardWidget> {
                         (snapshot.data?.user.value.num.val.sum() ?? 3) %
                             AvatarWidget.colors.length];
 
-                return Row(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.center,
+                return Column(
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
-                    const SizedBox(width: 12),
-                    Flexible(
-                      child: Container(
-                        decoration: BoxDecoration(
-                          border: Border(
-                            left: BorderSide(width: 2, color: color),
-                          ),
-                        ),
-                        margin: const EdgeInsets.fromLTRB(0, 8, 12, 8),
-                        padding: const EdgeInsets.only(left: 8),
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Row(
+                    Row(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        const SizedBox(width: 12),
+                        Flexible(
+                          child: Container(
+                            decoration: BoxDecoration(
+                              border: Border(
+                                left: BorderSide(width: 2, color: color),
+                              ),
+                            ),
+                            margin: const EdgeInsets.fromLTRB(0, 8, 12, 8),
+                            padding: const EdgeInsets.only(left: 8),
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Transform.scale(
-                                  scaleX: -1,
-                                  child:
-                                      Icon(Icons.reply, size: 17, color: color),
+                                Row(
+                                  children: [
+                                    Transform.scale(
+                                      scaleX: -1,
+                                      child: Icon(
+                                        Icons.reply,
+                                        size: 17,
+                                        color: color,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 6),
+                                    Flexible(
+                                      child: SelectionText(
+                                        snapshot.data?.user.value.name?.val ??
+                                            snapshot.data?.user.value.num.val ??
+                                            'dot'.l10n * 3,
+                                        selectable:
+                                            PlatformUtils.isDesktop || menu,
+                                        onChanged: (a) => _selection = a,
+                                        onSelecting: widget.onSelecting,
+                                        style: style.boldBody
+                                            .copyWith(color: color),
+                                      ),
+                                    ),
+                                  ],
                                 ),
-                                const SizedBox(width: 6),
-                                Flexible(
-                                  child: SelectionText(
-                                    snapshot.data?.user.value.name?.val ??
-                                        snapshot.data?.user.value.num.val ??
-                                        'dot'.l10n * 3,
-                                    selectable: PlatformUtils.isDesktop || menu,
-                                    onChanged: (a) => _selection = a,
-                                    onSelecting: widget.onSelecting,
-                                    style:
-                                        style.boldBody.copyWith(color: color),
+                                if (content != null) ...[
+                                  const SizedBox(height: 2),
+                                  content,
+                                ],
+                                if (additional.isNotEmpty) ...[
+                                  const SizedBox(height: 4),
+                                  Column(
+                                    mainAxisSize: MainAxisSize.min,
+                                    crossAxisAlignment:
+                                        msg.authorId == widget.me
+                                            ? CrossAxisAlignment.end
+                                            : CrossAxisAlignment.start,
+                                    children: additional,
                                   ),
-                                ),
+                                ],
                               ],
                             ),
-                            if (content != null) ...[
-                              const SizedBox(height: 2),
-                              content,
-                            ],
-                            if (additional.isNotEmpty) ...[
-                              const SizedBox(height: 4),
-                              Column(
-                                mainAxisSize: MainAxisSize.min,
-                                crossAxisAlignment: msg.authorId == widget.me
-                                    ? CrossAxisAlignment.end
-                                    : CrossAxisAlignment.start,
-                                children: additional,
-                              ),
-                            ],
-                          ],
+                          ),
                         ),
+                      ],
+                    ),
+                    if (timestamp)
+                      Padding(
+                        padding: const EdgeInsets.only(right: 8, bottom: 4),
+                        child: Obx(() {
+                          final bool isMonolog =
+                              widget.chat.value?.isMonolog == true;
+
+                          return MessageTimestamp(
+                            at: forward.value.at,
+                            status: _fromMe ? forward.value.status.value : null,
+                            read: _isRead || isMonolog,
+                            delivered: widget.chat.value?.lastDelivery
+                                        .isBefore(forward.value.at) ==
+                                    false ||
+                                isMonolog,
+                          );
+                        }),
                       ),
-                    )
                   ],
                 );
               },
@@ -656,15 +701,17 @@ class _ChatForwardWidgetState extends State<ChatForwardWidget> {
             opacity: _isRead || !_fromMe ? 1 : 0.55,
             child: Padding(
               padding: const EdgeInsets.fromLTRB(0, 4, 0, 4),
-              child: Column(
-                children: files
-                    .map(
-                      (e) => ChatItemWidget.fileAttachment(
-                        e,
-                        onFileTap: (a) => widget.onFileTap?.call(item, a),
-                      ),
-                    )
-                    .toList(),
+              child: SelectionContainer.disabled(
+                child: Column(
+                  children: files
+                      .map(
+                        (e) => ChatItemWidget.fileAttachment(
+                          e,
+                          onFileTap: (a) => widget.onFileTap?.call(item, a),
+                        ),
+                      )
+                      .toList(),
+                ),
               ),
             ),
           ),
diff --git a/lib/ui/page/home/page/chat/widget/chat_item.dart b/lib/ui/page/home/page/chat/widget/chat_item.dart
index 81611d3f92e..e8fc1c88cb6 100644
--- a/lib/ui/page/home/page/chat/widget/chat_item.dart
+++ b/lib/ui/page/home/page/chat/widget/chat_item.dart
@@ -63,6 +63,7 @@ import 'animated_offset.dart';
 import 'data_attachment.dart';
 import 'media_attachment.dart';
 import 'message_info/view.dart';
+import 'message_timestamp.dart';
 import 'selection_text.dart';
 import 'swipeable_status.dart';
 
@@ -78,8 +79,9 @@ class ChatItemWidget extends StatefulWidget {
     this.margin = const EdgeInsets.fromLTRB(0, 6, 0, 6),
     this.reads = const [],
     this.loadImages = true,
-    this.getUser,
     this.animation,
+    this.timestamp = true,
+    this.getUser,
     this.onHide,
     this.onDelete,
     this.onReply,
@@ -119,6 +121,13 @@ class ChatItemWidget extends StatefulWidget {
   /// fetched as soon as they are displayed, if any.
   final bool loadImages;
 
+  /// Optional animation that controls a [SwipeableStatus].
+  final AnimationController? animation;
+
+  /// Indicator whether a [ChatItem.at] should be displayed within this
+  /// [ChatItemWidget].
+  final bool timestamp;
+
   /// Callback, called when a [RxUser] identified by the provided [UserId] is
   /// required.
   final Future<RxUser?> Function(UserId userId)? getUser;
@@ -138,9 +147,6 @@ class ChatItemWidget extends StatefulWidget {
   /// Callback, called when a copy action of this [ChatItem] is triggered.
   final void Function(String text)? onCopy;
 
-  /// Optional animation that controls a [SwipeableStatus].
-  final AnimationController? animation;
-
   /// Callback, called when a gallery list is required.
   ///
   /// If not specified, then only media in this [item] will be in a gallery.
@@ -844,6 +850,10 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
       }
     }
 
+    // Indicator whether the [_timestamp] should be displayed in a bubble above
+    // the [ChatMessage] (e.g. if there's an [ImageAttachment]).
+    final bool timeInBubble = media.isNotEmpty;
+
     return _rounded(
       context,
       (menu) {
@@ -887,7 +897,13 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
                     child: WidgetButton(
                       onPressed:
                           menu ? null : () => widget.onRepliedTap?.call(e),
-                      child: _repliedMessage(e),
+                      child: _repliedMessage(
+                        e,
+                        timestamp: widget.timestamp &&
+                            i == msg.repliesTo.length - 1 &&
+                            _text == null &&
+                            msg.attachments.isEmpty,
+                      ),
                     ),
                   ),
                 ),
@@ -931,8 +947,16 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
                   files.isEmpty ? 10 : 0,
                 ),
                 child: SelectionText.rich(
-                  _text!,
                   key: Key('Text_${widget.item.value.id}'),
+                  TextSpan(
+                    children: [
+                      _text!,
+                      if (widget.timestamp && files.isEmpty && !timeInBubble)
+                        WidgetSpan(
+                          child: Opacity(opacity: 0, child: _timestamp(msg)),
+                        ),
+                    ],
+                  ),
                   selectable: PlatformUtils.isDesktop || menu,
                   onSelecting: widget.onSelecting,
                   onChanged: (a) => _selection = a,
@@ -946,15 +970,19 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
               opacity: _isRead || !_fromMe ? 1 : 0.55,
               child: Padding(
                 padding: const EdgeInsets.fromLTRB(0, 4, 0, 4),
-                child: Column(
-                  children: files
-                      .map(
-                        (e) => ChatItemWidget.fileAttachment(
+                child: SelectionContainer.disabled(
+                  child: Column(
+                    children: [
+                      ...files.mapIndexed(
+                        (i, e) => ChatItemWidget.fileAttachment(
                           e,
                           onFileTap: widget.onFileTap,
                         ),
-                      )
-                      .toList(),
+                      ),
+                      if (widget.timestamp && !timeInBubble)
+                        Opacity(opacity: 0, child: _timestamp(msg)),
+                    ],
+                  ),
                 ),
               ),
             ),
@@ -1022,27 +1050,47 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
 
         return Container(
           padding: widget.margin.add(const EdgeInsets.fromLTRB(5, 0, 2, 0)),
-          child: IntrinsicWidth(
-            child: AnimatedContainer(
-              duration: const Duration(milliseconds: 500),
-              decoration: BoxDecoration(
-                color: _fromMe
-                    ? _isRead
-                        ? style.readMessageColor
-                        : style.unreadMessageColor
-                    : style.messageColor,
-                borderRadius: BorderRadius.circular(15),
-                border: _fromMe
-                    ? _isRead
-                        ? style.secondaryBorder
-                        : Border.all(color: const Color(0xFFDAEDFF), width: 0.5)
-                    : style.primaryBorder,
-              ),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: children,
+          child: Stack(
+            children: [
+              IntrinsicWidth(
+                child: AnimatedContainer(
+                  duration: const Duration(milliseconds: 500),
+                  decoration: BoxDecoration(
+                    color: _fromMe
+                        ? _isRead
+                            ? style.readMessageColor
+                            : style.unreadMessageColor
+                        : style.messageColor,
+                    borderRadius: BorderRadius.circular(15),
+                    border: _fromMe
+                        ? _isRead
+                            ? style.secondaryBorder
+                            : Border.all(
+                                color: const Color(0xFFDAEDFF), width: 0.5)
+                        : style.primaryBorder,
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: children,
+                  ),
+                ),
               ),
-            ),
+              if (widget.timestamp)
+                Positioned(
+                  right: timeInBubble ? 6 : 8,
+                  bottom: 4,
+                  child: timeInBubble
+                      ? Container(
+                          padding: const EdgeInsets.only(left: 4, right: 4),
+                          decoration: BoxDecoration(
+                            color: Colors.white.withOpacity(0.9),
+                            borderRadius: BorderRadius.circular(20),
+                          ),
+                          child: _timestamp(msg),
+                        )
+                      : _timestamp(msg),
+                )
+            ],
           ),
         );
       },
@@ -1099,80 +1147,110 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
         : AvatarWidget.colors[(widget.user?.user.value.num.val.sum() ?? 3) %
             AvatarWidget.colors.length];
 
+    final Widget call = Container(
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(10),
+        color: Colors.black.withOpacity(0.03),
+      ),
+      padding: const EdgeInsets.fromLTRB(6, 8, 8, 8),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(8, 0, 12, 0),
+            child: message.withVideo
+                ? SvgLoader.asset(
+                    'assets/icons/call_video${isMissed && !_fromMe ? '_red' : ''}.svg',
+                    height: 13 * 1.4,
+                  )
+                : SvgLoader.asset(
+                    'assets/icons/call_audio${isMissed && !_fromMe ? '_red' : ''}.svg',
+                    height: 15 * 1.4,
+                  ),
+          ),
+          Flexible(
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Flexible(
+                  child: Text(
+                    title,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: style.boldBody,
+                  ),
+                ),
+                if (time != null) ...[
+                  const SizedBox(width: 8),
+                  Padding(
+                    padding: const EdgeInsets.only(bottom: 1),
+                    child: Text(
+                      time,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: Theme.of(context).textTheme.titleSmall,
+                    ),
+                  ),
+                ],
+              ],
+            ),
+          ),
+          const SizedBox(width: 8),
+        ],
+      ),
+    );
+
     final Widget child = AnimatedOpacity(
       duration: const Duration(milliseconds: 500),
       opacity: _isRead || !_fromMe ? 1 : 0.55,
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(8, 8, 8, 10),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (!_fromMe && widget.chat.value?.isGroup == true && widget.avatar)
-              Padding(
-                padding: const EdgeInsets.fromLTRB(4, 0, 4, 0),
-                child: Text(
-                  widget.user?.user.value.name?.val ??
-                      widget.user?.user.value.num.val ??
-                      'dot'.l10n * 3,
-                  style: style.boldBody.copyWith(color: color),
-                ),
-              ),
-            const SizedBox(height: 4),
-            Container(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(10),
-                color: Colors.black.withOpacity(0.03),
-              ),
-              padding: const EdgeInsets.fromLTRB(6, 8, 8, 8),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
+      child: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(8, 8, 8, 10),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (!_fromMe &&
+                    widget.chat.value?.isGroup == true &&
+                    widget.avatar)
                   Padding(
-                    padding: const EdgeInsets.fromLTRB(8, 0, 12, 0),
-                    child: message.withVideo
-                        ? SvgLoader.asset(
-                            'assets/icons/call_video${isMissed && !_fromMe ? '_red' : ''}.svg',
-                            height: 13 * 1.4,
-                          )
-                        : SvgLoader.asset(
-                            'assets/icons/call_audio${isMissed && !_fromMe ? '_red' : ''}.svg',
-                            height: 15 * 1.4,
-                          ),
+                    padding: const EdgeInsets.fromLTRB(4, 0, 4, 0),
+                    child: Text(
+                      widget.user?.user.value.name?.val ??
+                          widget.user?.user.value.num.val ??
+                          'dot'.l10n * 3,
+                      style: style.boldBody.copyWith(color: color),
+                    ),
                   ),
-                  Flexible(
-                    child: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Flexible(
-                          child: Text(
-                            title,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: style.boldBody,
-                          ),
-                        ),
-                        if (time != null) ...[
-                          const SizedBox(width: 8),
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 1),
-                            child: Text(
-                              time,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              style: Theme.of(context).textTheme.titleSmall,
+                const SizedBox(height: 4),
+                Text.rich(
+                  TextSpan(
+                    children: [
+                      WidgetSpan(child: call),
+                      if (widget.timestamp)
+                        WidgetSpan(
+                          child: Opacity(
+                            opacity: 0,
+                            child: Padding(
+                              padding: const EdgeInsets.only(left: 4),
+                              child: _timestamp(widget.item.value),
                             ),
                           ),
-                        ],
-                      ],
-                    ),
+                        ),
+                    ],
                   ),
-                  const SizedBox(width: 8),
-                ],
-              ),
+                ),
+              ],
             ),
-          ],
-        ),
+          ),
+          if (widget.timestamp)
+            Positioned(
+              right: 8,
+              bottom: 4,
+              child: _timestamp(widget.item.value),
+            )
+        ],
       ),
     );
 
@@ -1205,7 +1283,7 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
   }
 
   /// Renders the provided [item] as a replied message.
-  Widget _repliedMessage(ChatItemQuote item) {
+  Widget _repliedMessage(ChatItemQuote item, {bool timestamp = false}) {
     Style style = Theme.of(context).extension<Style>()!;
     bool fromMe = item.author == widget.me;
 
@@ -1371,36 +1449,45 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
           children: [
             const SizedBox(width: 12),
             Flexible(
-              child: Container(
-                decoration: BoxDecoration(
-                  border: Border(left: BorderSide(width: 2, color: color)),
-                ),
-                margin: const EdgeInsets.fromLTRB(0, 8, 12, 8),
-                padding: const EdgeInsets.only(left: 8),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      snapshot.data?.user.value.name?.val ??
-                          snapshot.data?.user.value.num.val ??
-                          'dot'.l10n * 3,
-                      style: style.boldBody.copyWith(color: color),
+              child: Column(
+                children: [
+                  Container(
+                    decoration: BoxDecoration(
+                      border: Border(left: BorderSide(width: 2, color: color)),
                     ),
-                    if (content != null) ...[
-                      const SizedBox(height: 2),
-                      DefaultTextStyle.merge(
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        child: content,
-                      ),
-                    ],
-                    if (additional.isNotEmpty) ...[
-                      const SizedBox(height: 4),
-                      Row(mainAxisSize: MainAxisSize.min, children: additional),
-                    ],
-                  ],
-                ),
+                    margin: const EdgeInsets.fromLTRB(0, 8, 12, 8),
+                    padding: const EdgeInsets.only(left: 8),
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          snapshot.data?.user.value.name?.val ??
+                              snapshot.data?.user.value.num.val ??
+                              'dot'.l10n * 3,
+                          style: style.boldBody.copyWith(color: color),
+                        ),
+                        if (content != null) ...[
+                          const SizedBox(height: 2),
+                          DefaultTextStyle.merge(
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            child: content,
+                          ),
+                        ],
+                        if (additional.isNotEmpty) ...[
+                          const SizedBox(height: 4),
+                          Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: additional,
+                          ),
+                        ],
+                      ],
+                    ),
+                  ),
+                  if (timestamp)
+                    Opacity(opacity: 0, child: _timestamp(widget.item.value)),
+                ],
               ),
             ),
           ],
@@ -1428,7 +1515,7 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
           e.memberId != widget.item.value.authorId,
     );
 
-    bool isSent = item.status.value == SendingStatus.sent;
+    final bool isSent = item.status.value == SendingStatus.sent;
 
     const int maxAvatars = 5;
     final List<Widget> avatars = [];
@@ -1470,6 +1557,36 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
       }
     }
 
+    // Builds the provided [builder] and the [avatars], if any.
+    Widget child(bool menu) {
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.end,
+        children: [
+          builder(menu),
+          if (avatars.isNotEmpty)
+            Transform.translate(
+              offset: Offset(-12, -widget.margin.bottom),
+              child: WidgetButton(
+                onPressed: () => MessageInfo.show(
+                  context,
+                  reads: reads ?? [],
+                  id: widget.item.value.id,
+                ),
+                child: Padding(
+                  padding: const EdgeInsets.only(bottom: 2),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: avatars,
+                  ),
+                ),
+              ),
+            ),
+        ],
+      );
+    }
+
     return SwipeableStatus(
       animation: widget.animation,
       translate: _fromMe,
@@ -1481,7 +1598,7 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
       isError: item.status.value == SendingStatus.error,
       isSending: item.status.value == SendingStatus.sending,
       swipeable: Text(DateFormat.Hm().format(item.at.val.toLocal())),
-      padding: EdgeInsets.only(bottom: avatars.isNotEmpty == true ? 33 : 13),
+      padding: EdgeInsets.only(bottom: avatars.isNotEmpty ? 33 : 13),
       child: AnimatedOffset(
         duration: _offsetDuration,
         offset: _offset,
@@ -1551,7 +1668,7 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
             mainAxisAlignment:
                 _fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
             children: [
-              if (_fromMe)
+              if (_fromMe && !widget.timestamp)
                 Padding(
                   key: Key('MessageStatus_${item.id}'),
                   padding: const EdgeInsets.only(top: 16),
@@ -1769,33 +1886,8 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
                             ),
                           ],
                         ],
-                        builder: (bool menu) => Column(
-                          mainAxisSize: MainAxisSize.min,
-                          crossAxisAlignment: CrossAxisAlignment.end,
-                          children: [
-                            builder(menu),
-                            if (avatars.isNotEmpty)
-                              Transform.translate(
-                                offset: Offset(-12, -widget.margin.bottom),
-                                child: WidgetButton(
-                                  onPressed: () => MessageInfo.show(
-                                    context,
-                                    reads: reads ?? [],
-                                    id: widget.item.value.id,
-                                  ),
-                                  child: Padding(
-                                    padding: const EdgeInsets.only(bottom: 2),
-                                    child: Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.center,
-                                      children: avatars,
-                                    ),
-                                  ),
-                                ),
-                              ),
-                          ],
-                        ),
+                        builder: PlatformUtils.isMobile ? child : null,
+                        child: PlatformUtils.isMobile ? null : child(false),
                       ),
                     ),
                   );
@@ -1808,6 +1900,25 @@ class _ChatItemWidgetState extends State<ChatItemWidget> {
     );
   }
 
+  /// Builds a [MessageTimestamp] of the provided [item].
+  Widget _timestamp(ChatItem item) {
+    return Obx(() {
+      final bool isMonolog = widget.chat.value?.isMonolog == true;
+
+      return KeyedSubtree(
+        key: Key('MessageStatus_${item.id}'),
+        child: MessageTimestamp(
+          at: item.at,
+          status: _fromMe ? item.status.value : null,
+          read: _isRead || isMonolog,
+          delivered:
+              widget.chat.value?.lastDelivery.isBefore(item.at) == false ||
+                  isMonolog,
+        ),
+      );
+    });
+  }
+
   /// Populates the [_worker] invoking the [_populateSpans] and
   /// [_populateGlobalKeys] on the [ChatItemWidget.item] changes.
   void _populateWorker() {
diff --git a/lib/ui/page/home/page/chat/widget/data_attachment.dart b/lib/ui/page/home/page/chat/widget/data_attachment.dart
index a6383c1107e..bde001c8089 100644
--- a/lib/ui/page/home/page/chat/widget/data_attachment.dart
+++ b/lib/ui/page/home/page/chat/widget/data_attachment.dart
@@ -129,11 +129,14 @@ class _DataAttachmentState extends State<DataAttachment> {
                   color: Theme.of(context).colorScheme.secondary,
                 ),
               ),
-              child: Center(
-                child: SvgLoader.asset(
-                  'assets/icons/arrow_down.svg',
-                  width: 10.55,
-                  height: 14,
+              child: KeyedSubtree(
+                key: const Key('Sent'),
+                child: Center(
+                  child: SvgLoader.asset(
+                    'assets/icons/arrow_down.svg',
+                    width: 10.55,
+                    height: 14,
+                  ),
                 ),
               ),
             );
diff --git a/lib/ui/page/home/page/chat/widget/message_timestamp.dart b/lib/ui/page/home/page/chat/widget/message_timestamp.dart
new file mode 100644
index 00000000000..5c77dfffe78
--- /dev/null
+++ b/lib/ui/page/home/page/chat/widget/message_timestamp.dart
@@ -0,0 +1,98 @@
+// Copyright © 2022-2023 IT ENGINEERING MANAGEMENT INC,
+//                       <https://github.com/team113>
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Affero General Public License v3.0 as published by the
+// Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License v3.0 for
+// more details.
+//
+// You should have received a copy of the GNU Affero General Public License v3.0
+// along with this program. If not, see
+// <https://www.gnu.org/licenses/agpl-3.0.html>.
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+
+import '/domain/model/precise_date_time/precise_date_time.dart';
+import '/domain/model/sending_status.dart';
+import '/themes.dart';
+
+/// [Row] displaying the provided [status] and [at] stylized to be a status of
+/// some [ChatItem].
+class MessageTimestamp extends StatelessWidget {
+  const MessageTimestamp({
+    super.key,
+    required this.at,
+    this.status,
+    this.read = false,
+    this.delivered = false,
+  });
+
+  /// [PreciseDateTime] to display in this [MessageTimestamp].
+  final PreciseDateTime at;
+
+  /// [SendingStatus] to display in this [MessageTimestamp], if any.
+  final SendingStatus? status;
+
+  /// Indicator whether this [MessageTimestamp] is considered to be read,
+  /// meaning it should display an appropriate icon.
+  final bool read;
+
+  /// Indicator whether this [MessageTimestamp] is considered to be delivered,
+  /// meaning it should display an appropriate icon.
+  final bool delivered;
+
+  @override
+  Widget build(BuildContext context) {
+    final Style style = Theme.of(context).extension<Style>()!;
+
+    final bool isSent = status == SendingStatus.sent;
+    final bool isDelivered = isSent && delivered;
+    final bool isRead = isSent && read;
+    final bool isError = status == SendingStatus.error;
+    final bool isSending = status == SendingStatus.sending;
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        if (status != null) ...[
+          if (isSent || isDelivered || isRead || isSending || isError)
+            Icon(
+              (isRead || isDelivered)
+                  ? Icons.done_all
+                  : isSending
+                      ? Icons.access_alarm
+                      : isError
+                          ? Icons.error_outline
+                          : Icons.done,
+              color: isRead
+                  ? Theme.of(context).colorScheme.secondary
+                  : isError
+                      ? Colors.red
+                      : Theme.of(context).colorScheme.primary,
+              size: 12,
+              key: Key(
+                isError
+                    ? 'Error'
+                    : isSending
+                        ? 'Sending'
+                        : 'Sent',
+              ),
+            ),
+          const SizedBox(width: 3),
+        ],
+        SelectionContainer.disabled(
+          child: Text(
+            DateFormat.Hm().format(at.val.toLocal()),
+            style: style.systemMessageStyle.copyWith(fontSize: 11),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/ui/page/home/page/my_profile/timeline_switch/controller.dart b/lib/ui/page/home/page/my_profile/timeline_switch/controller.dart
new file mode 100644
index 00000000000..e7811f55c57
--- /dev/null
+++ b/lib/ui/page/home/page/my_profile/timeline_switch/controller.dart
@@ -0,0 +1,41 @@
+// Copyright © 2022-2023 IT ENGINEERING MANAGEMENT INC,
+//                       <https://github.com/team113>
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Affero General Public License v3.0 as published by the
+// Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License v3.0 for
+// more details.
+//
+// You should have received a copy of the GNU Affero General Public License v3.0
+// along with this program. If not, see
+// <https://www.gnu.org/licenses/agpl-3.0.html>.
+
+import 'dart:async';
+
+import 'package:get/get.dart';
+
+import '/domain/model/application_settings.dart';
+import '/domain/repository/settings.dart';
+
+export 'view.dart';
+
+/// Controller of a [TimelineSwitchView].
+class TimelineSwitchController extends GetxController {
+  TimelineSwitchController(this._settingsRepository);
+
+  /// Settings repository updating the [ApplicationSettings.timelineEnabled].
+  final AbstractSettingsRepository _settingsRepository;
+
+  /// Returns the current [ApplicationSettings] value.
+  Rx<ApplicationSettings?> get settings =>
+      _settingsRepository.applicationSettings;
+
+  /// Sets the [ApplicationSettings.timelineEnabled] value.
+  Future<void> setTimelineEnabled(bool enabled) =>
+      _settingsRepository.setTimelineEnabled(enabled);
+}
diff --git a/lib/ui/page/home/page/my_profile/timeline_switch/view.dart b/lib/ui/page/home/page/my_profile/timeline_switch/view.dart
new file mode 100644
index 00000000000..f41274fb2a3
--- /dev/null
+++ b/lib/ui/page/home/page/my_profile/timeline_switch/view.dart
@@ -0,0 +1,142 @@
+// Copyright © 2022-2023 IT ENGINEERING MANAGEMENT INC,
+//                       <https://github.com/team113>
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Affero General Public License v3.0 as published by the
+// Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License v3.0 for
+// more details.
+//
+// You should have received a copy of the GNU Affero General Public License v3.0
+// along with this program. If not, see
+// <https://www.gnu.org/licenses/agpl-3.0.html>.
+
+import 'package:animated_size_and_fade/animated_size_and_fade.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import '/domain/model/application_settings.dart';
+import '/l10n/l10n.dart';
+import '/themes.dart';
+import '/ui/page/home/widget/avatar.dart';
+import '/ui/widget/modal_popup.dart';
+import 'controller.dart';
+
+/// View for updating the [ApplicationSettings.timelineEnabled] value.
+///
+/// Intended to be displayed with the [show] method.
+class TimelineSwitchView extends StatelessWidget {
+  const TimelineSwitchView({super.key});
+
+  /// Displays a [TimelineSwitchView] wrapped in a [ModalPopup].
+  static Future<T?> show<T>(BuildContext context) {
+    return ModalPopup.show(context: context, child: const TimelineSwitchView());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Style style = Theme.of(context).extension<Style>()!;
+    final TextStyle? thin =
+        Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.black);
+
+    return GetBuilder(
+      init: TimelineSwitchController(Get.find()),
+      builder: (TimelineSwitchController c) {
+        return AnimatedSizeAndFade(
+          fadeDuration: const Duration(milliseconds: 250),
+          sizeDuration: const Duration(milliseconds: 250),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const SizedBox(height: 4),
+              ModalPopupHeader(
+                header: Center(
+                  child: Text(
+                    'label_display_timestamps'.l10n,
+                    style: thin?.copyWith(fontSize: 18),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 13),
+              Flexible(
+                child: ListView.separated(
+                  shrinkWrap: true,
+                  padding: ModalPopup.padding(context),
+                  separatorBuilder: (_, __) => const SizedBox(height: 8),
+                  itemCount: 2,
+                  itemBuilder: (_, i) {
+                    return Obx(() {
+                      final bool enabled =
+                          (c.settings.value?.timelineEnabled ?? true);
+
+                      final bool selected;
+                      if (i == 0) {
+                        selected = enabled;
+                      } else {
+                        selected = !enabled;
+                      }
+
+                      return Material(
+                        borderRadius: BorderRadius.circular(10),
+                        color: selected
+                            ? style.cardSelectedColor.withOpacity(0.8)
+                            : Colors.white.darken(0.05),
+                        child: InkWell(
+                          borderRadius: BorderRadius.circular(10),
+                          onTap: () => c.setTimelineEnabled(i == 0),
+                          child: Padding(
+                            padding: const EdgeInsets.all(16.0),
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: Text(
+                                    i == 0
+                                        ? 'label_as_timeline'.l10n
+                                        : 'label_in_message'.l10n,
+                                    maxLines: 2,
+                                    overflow: TextOverflow.ellipsis,
+                                    style: const TextStyle(fontSize: 15),
+                                  ),
+                                ),
+                                const SizedBox(width: 12),
+                                SizedBox(
+                                  width: 20,
+                                  height: 20,
+                                  child: AnimatedSwitcher(
+                                    duration: 200.milliseconds,
+                                    child: selected
+                                        ? CircleAvatar(
+                                            backgroundColor: Theme.of(context)
+                                                .colorScheme
+                                                .secondary,
+                                            radius: 12,
+                                            child: const Icon(
+                                              Icons.check,
+                                              color: Colors.white,
+                                              size: 12,
+                                            ),
+                                          )
+                                        : const SizedBox(),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      );
+                    });
+                  },
+                ),
+              ),
+              const SizedBox(height: 16),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/ui/page/home/page/my_profile/view.dart b/lib/ui/page/home/page/my_profile/view.dart
index ca666fc85e6..19590bd1f9c 100644
--- a/lib/ui/page/home/page/my_profile/view.dart
+++ b/lib/ui/page/home/page/my_profile/view.dart
@@ -55,6 +55,7 @@ import 'link_details/view.dart';
 import 'microphone_switch/view.dart';
 import 'output_switch/view.dart';
 import 'password/view.dart';
+import 'timeline_switch/view.dart';
 import 'widget/copyable.dart';
 import 'widget/download_button.dart';
 
@@ -222,6 +223,12 @@ class MyProfileView extends StatelessWidget {
                           children: [_background(context, c)],
                         );
 
+                      case ProfileTab.chats:
+                        return Block(
+                          title: 'label_chats'.l10n,
+                          children: [_chats(context, c)],
+                        );
+
                       case ProfileTab.calls:
                         if (PlatformUtils.isDesktop && PlatformUtils.isWeb) {
                           return Block(
@@ -1103,6 +1110,46 @@ Widget _call(BuildContext context, MyProfileController c) {
   );
 }
 
+/// Returns the contents of a [ProfileTab.chats] section.
+Widget _chats(BuildContext context, MyProfileController c) {
+  final Style style = Theme.of(context).extension<Style>()!;
+
+  return Column(
+    mainAxisSize: MainAxisSize.min,
+    children: [
+      _dense(
+        Align(
+          alignment: Alignment.centerLeft,
+          child: Padding(
+            padding: const EdgeInsets.only(left: 21.0),
+            child: Text(
+              'label_display_timestamps'.l10n,
+              style: style.systemMessageStyle.copyWith(
+                color: Theme.of(context).colorScheme.primary,
+                fontSize: 15,
+                fontWeight: FontWeight.w400,
+              ),
+            ),
+          ),
+        ),
+      ),
+      const SizedBox(height: 4),
+      _dense(
+        Obx(() {
+          return FieldButton(
+            text: (c.settings.value?.timelineEnabled ?? true)
+                ? 'label_as_timeline'.l10n
+                : 'label_in_message'.l10n,
+            maxLines: null,
+            onPressed: () => TimelineSwitchView.show(context),
+            style: TextStyle(color: Theme.of(context).colorScheme.secondary),
+          );
+        }),
+      ),
+    ],
+  );
+}
+
 /// Returns the contents of a [ProfileTab.media] section.
 Widget _media(BuildContext context, MyProfileController c) {
   return Column(
diff --git a/lib/ui/page/home/tab/menu/view.dart b/lib/ui/page/home/tab/menu/view.dart
index f63e65c31c0..3db2977c71b 100644
--- a/lib/ui/page/home/tab/menu/view.dart
+++ b/lib/ui/page/home/tab/menu/view.dart
@@ -235,6 +235,14 @@ class MenuTabView extends StatelessWidget {
                     );
                     break;
 
+                  case ProfileTab.chats:
+                    child = card(
+                      icon: Icons.chat_bubble,
+                      title: 'label_chats'.l10n,
+                      subtitle: 'label_timeline_style'.l10n,
+                    );
+                    break;
+
                   case ProfileTab.calls:
                     if (PlatformUtils.isDesktop && PlatformUtils.isWeb) {
                       child = card(
diff --git a/test/e2e/features/auth/create_account/.feature b/test/e2e/features/auth/create_account/.feature
index 39c3e324d24..6c42837b1dc 100644
--- a/test/e2e/features/auth/create_account/.feature
+++ b/test/e2e/features/auth/create_account/.feature
@@ -37,7 +37,8 @@ Feature: Account creation
     And I tap `CloseButton` button
     Then I wait until `ChangePassword` is present
 
-    When I tap `DangerZone` button
+    When I scroll `MenuListView` until `DangerZone` is present
+    And I tap `DangerZone` button
     And I scroll `MyProfileScrollable` until `DeleteAccount` is present
     And I tap `DeleteAccount` button
     And I tap `Proceed` button
diff --git a/test/e2e/features/profile/l10n/.feature b/test/e2e/features/profile/l10n/.feature
index de76e767a6e..f44ea43bea7 100644
--- a/test/e2e/features/profile/l10n/.feature
+++ b/test/e2e/features/profile/l10n/.feature
@@ -22,6 +22,7 @@ Feature: Localization
     And I wait until `HomeView` is present
 
     When I tap `MenuButton` button
+    And I scroll `MenuListView` until `Language` is present
     And I tap `Language` button
     And I tap `ChangeLanguage` button
     And I tap `Language_ru` button
diff --git a/test/e2e/mock/platform_utils.dart b/test/e2e/mock/platform_utils.dart
index d277f61708f..38227cf4e05 100644
--- a/test/e2e/mock/platform_utils.dart
+++ b/test/e2e/mock/platform_utils.dart
@@ -40,7 +40,7 @@ class PlatformUtilsMock extends PlatformUtilsImpl {
       if (cancelToken?.isCancelled == true) {
         break;
       }
-      await Future.delayed(40.milliseconds);
+      await Future.delayed(50.milliseconds);
       onReceiveProgress?.call(count, total);
     }
 
diff --git a/test/e2e/steps/select_text.dart b/test/e2e/steps/select_text.dart
index 4604062b87a..4d24c89efb4 100644
--- a/test/e2e/steps/select_text.dart
+++ b/test/e2e/steps/select_text.dart
@@ -53,11 +53,13 @@ final StepDefinitionGeneric selectMessageText =
         context.world.appDriver.findByKeySkipOffstage('Text_${message.id}');
     final RenderParagraph paragraph =
         context.world.appDriver.nativeDriver.renderObject<RenderParagraph>(
-      find.descendant(
-        of: finder,
-        matching: find.byType(RichText, skipOffstage: false),
-        skipOffstage: false,
-      ),
+      find
+          .descendant(
+            of: finder,
+            matching: find.byType(RichText, skipOffstage: false),
+            skipOffstage: false,
+          )
+          .first,
     );
 
     // Returns an [Offset] of the provided [paragraph].
diff --git a/test/widget/chat_edit_message_test.dart b/test/widget/chat_edit_message_test.dart
index c9995794ce6..3e2bc090fd1 100644
--- a/test/widget/chat_edit_message_test.dart
+++ b/test/widget/chat_edit_message_test.dart
@@ -67,6 +67,7 @@ import 'package:mockito/mockito.dart';
 
 import '../mock/overflow_error.dart';
 import 'chat_edit_message_test.mocks.dart';
+import 'extension/rich_text.dart';
 
 @GenerateMocks([GraphQlProvider, PlatformRouteInformationProvider])
 void main() async {
@@ -359,7 +360,7 @@ void main() async {
     ));
     await tester.pumpAndSettle(const Duration(seconds: 2));
 
-    var message = find.text('edit message', skipOffstage: false);
+    var message = find.richText('edit message', skipOffstage: false);
     expect(message, findsOneWidget);
     await tester.longPress(message);
     await tester.pumpAndSettle(const Duration(seconds: 10));
@@ -380,7 +381,7 @@ void main() async {
       find.text('edit message', skipOffstage: false),
       findsNothing,
     );
-    expect(find.text('new text', skipOffstage: false), findsOneWidget);
+    expect(find.richText('new text', skipOffstage: false), findsOneWidget);
 
     await Get.deleteAll(force: true);
   });
diff --git a/test/widget/chat_reply_message_test.dart b/test/widget/chat_reply_message_test.dart
index 49558a653c8..48d6f6a4ec6 100644
--- a/test/widget/chat_reply_message_test.dart
+++ b/test/widget/chat_reply_message_test.dart
@@ -68,6 +68,7 @@ import 'package:mockito/mockito.dart';
 
 import '../mock/overflow_error.dart';
 import 'chat_reply_message_test.mocks.dart';
+import 'extension/rich_text.dart';
 
 @GenerateMocks([GraphQlProvider, PlatformRouteInformationProvider])
 void main() async {
@@ -444,7 +445,7 @@ void main() async {
     await gesture.addPointer(location: Offset.zero);
     addTearDown(gesture.removePointer);
 
-    var message = find.text('text message', skipOffstage: false);
+    var message = find.richText('text message', skipOffstage: false);
     expect(message, findsOneWidget);
 
     await tester.longPress(message);
@@ -469,7 +470,7 @@ void main() async {
     await tester.testTextInput.receiveAction(TextInputAction.done);
     await tester.pumpAndSettle(const Duration(seconds: 2));
 
-    expect(find.text('reply message', skipOffstage: false), findsOneWidget);
+    expect(find.richText('reply message', skipOffstage: false), findsOneWidget);
 
     await Get.deleteAll(force: true);
   });
diff --git a/test/widget/extension/rich_text.dart b/test/widget/extension/rich_text.dart
new file mode 100644
index 00000000000..4f5cdca597a
--- /dev/null
+++ b/test/widget/extension/rich_text.dart
@@ -0,0 +1,34 @@
+// Copyright © 2022-2023 IT ENGINEERING MANAGEMENT INC,
+//                       <https://github.com/team113>
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Affero General Public License v3.0 as published by the
+// Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License v3.0 for
+// more details.
+//
+// You should have received a copy of the GNU Affero General Public License v3.0
+// along with this program. If not, see
+// <https://www.gnu.org/licenses/agpl-3.0.html>.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+// TODO: Remove and use [find.text] when flutter/flutter#124859 is fixed:
+//       https://github.com/flutter/flutter/issues/124859
+/// Extension adding finder for a [RichText].
+extension RichTextExtension on CommonFinders {
+  /// Returns a [Finder] matching a [RichText] with the provided [text], if any.
+  Finder richText(String text, {bool skipOffstage = true}) {
+    return find.byWidgetPredicate(
+      (Widget widget) =>
+          widget is RichText &&
+          widget.text.toPlainText(includePlaceholders: false) == text,
+      skipOffstage: skipOffstage,
+    );
+  }
+}