1 files changed, 6 insertions, 5 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index dc0e605a..4d4b82c1 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -384,12 +384,12 @@ int m_delfriend(Messenger *m, int32_t friendnumber)
     clear_receipts(m, friendnumber);
     remove_request_received(&(m->fr), m->friendlist[friendnumber].real_pk);
     friend_connection_callbacks(m->fr_c, m->friendlist[friendnumber].friendcon_id, MESSENGER_CALLBACK_INDEX, 0, 0, 0, 0, 0);
-    kill_friend_connection(m->fr_c, m->friendlist[friendnumber].friendcon_id);
 
     if (friend_con_connected(m->fr_c, m->friendlist[friendnumber].friendcon_id) == FRIENDCONN_STATUS_CONNECTED) {
         send_offline_packet(m, m->friendlist[friendnumber].friendcon_id);
     }
 
+    kill_friend_connection(m->fr_c, m->friendlist[friendnumber].friendcon_id);
     memset(&(m->friendlist[friendnumber]), 0, sizeof(Friend));
     uint32_t i;
 
@@ -864,6 +864,11 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui
         if (was_online) {
             break_files(m, friendnumber);
             clear_receipts(m, friendnumber);
+        } else {
+            m->friendlist[friendnumber].name_sent = 0;
+            m->friendlist[friendnumber].userstatus_sent = 0;
+            m->friendlist[friendnumber].statusmessage_sent = 0;
+            m->friendlist[friendnumber].user_istyping_sent = 0;
         }
 
         m->friendlist[friendnumber].status = status;
@@ -1891,10 +1896,6 @@ static int handle_status(void *object, int i, uint8_t status)
 
     if (status) { /* Went online. */
         send_online_packet(m, i);
-        m->friendlist[i].name_sent = 0;
-        m->friendlist[i].userstatus_sent = 0;
-        m->friendlist[i].statusmessage_sent = 0;
-        m->friendlist[i].user_istyping_sent = 0;
     } else { /* Went offline. */
         if (m->friendlist[i].status == FRIEND_ONLINE) {
             set_friend_status(m, i, FRIEND_CONFIRMED);