1 files changed, 6 insertions, 1 deletions

diff --git a/XMPPToTox.hs b/XMPPToTox.hs
index 7ca4330e..ae9a774b 100644
--- a/XMPPToTox.hs
+++ b/XMPPToTox.hs
@@ -23,7 +23,9 @@ funnyMessage :: MonadThrow m => Text -> ConduitM i CryptoMessage m ()
 funnyMessage txt = yield $ UpToN Padding (T.encodeUtf8 txt)
 
 sendMsg :: MonadThrow m => Text -> ConduitM i CryptoMessage m ()
-sendMsg txt = yield $ UpToN MESSAGE (T.encodeUtf8 txt)
+sendMsg txt = do
+    yield $ UpToN MESSAGE (T.encodeUtf8 txt)
+    yield $ TwoByte TYPING 0 -- Message send implies not typing.
 
 
 eom :: MonadThrow m => ConduitM Event o m ()
@@ -42,6 +44,9 @@ msgToTox = tag' "{jabber:server}message"
     , tagIgnoreAttrs "{http://jabber.org/protocol/chatstates}composing"
        $ do yield $ TwoByte TYPING 1
             eom
+    , tagIgnoreAttrs "{http://jabber.org/protocol/chatstates}active"
+       $ do yield $ TwoByte TYPING 0
+            eom
     , tagIgnoreAttrs "{http://jabber.org/protocol/chatstates}paused"
        $ do yield $ TwoByte TYPING 0
             eom