From 0abd9af449e88630c7c96b0c1dc773374ff7aa27 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Tue, 19 Nov 2019 11:35:25 +1100
Subject: [PATCH 1/3] Jump words with Ctrl and arrow keys

---
 js/views/conversation_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index eac739ed5..4ba95d709 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -2418,7 +2418,7 @@
 
       // Alt would normally make the cursor go until the next whitespace,
       // but we need to take the presence of a mention into account
-      if (event.altKey) {
+      if (event.altKey || event.ctrlKey) {
         const searchFrom = isLeft ? posToChange - 1 : posToChange + 1;
         const toSearch = isLeft
           ? text.substr(0, searchFrom)

From e738e07d3e3b6241e3e905bb449d33ad270ed4d9 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Tue, 19 Nov 2019 15:58:17 +1100
Subject: [PATCH 2/3] Add missing margin to typing indicator bubbles

---
 ts/components/conversation/TypingBubble.tsx | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index d4566f677..53229f985 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -52,18 +52,22 @@ export class TypingBubble extends React.Component<Props> {
     const { i18n, color } = this.props;
 
     return (
-      <div className={classNames('module-message', 'module-message--incoming')}>
+      <div className="loki-message-wrapper">
         <div
-          className={classNames(
-            'module-message__container',
-            'module-message__container--incoming',
-            `module-message__container--incoming-${color}`
-          )}
+          className={classNames('module-message', 'module-message--incoming')}
         >
-          <div className="module-message__typing-container">
-            <TypingAnimation color="light" i18n={i18n} />
+          <div
+            className={classNames(
+              'module-message__container',
+              'module-message__container--incoming',
+              `module-message__container--incoming-${color}`
+            )}
+          >
+            <div className="module-message__typing-container">
+              <TypingAnimation color="light" i18n={i18n} />
+            </div>
+            {this.renderAvatar()}
           </div>
-          {this.renderAvatar()}
         </div>
       </div>
     );

From 02cf9d58c860921c676d38262f4acf0fd2c4ba08 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Thu, 21 Nov 2019 12:52:12 +1100
Subject: [PATCH 3/3] Explicitly set server id for avatars to null

---
 js/modules/loki_app_dot_net_api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index 89787a06c..5b347233d 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -468,8 +468,11 @@ class LokiAppDotNetServerAPI {
       response.data &&
       response.data.avatar_image &&
       response.data.avatar_image.url;
+
+    // We don't use the server id for avatars
     return {
       url,
+      id: null,
     };
   }