diff --git a/src/chat.c b/src/chat.c
index f841f45..4fa0cf7 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -98,7 +98,7 @@ static void chat_onAction(ToxWindow *self, Tox *m, int num, uint8_t *action, uin
     beep();
 }
 
-static void chat_onNickChange(ToxWindow *self, Tox *m, int num, uint8_t *nick, uint16_t len)
+static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)
 {
     if (self->friendnum != num)
         return;
diff --git a/src/friendlist.c b/src/friendlist.c
index 6926626..c8a9169 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -56,7 +56,7 @@ void friendlist_onConnectionChange(ToxWindow *self, Tox *m, int num, uint8_t sta
         friends[num].online = false;
 }
 
-void friendlist_onNickChange(ToxWindow *self, Tox *m, int num, uint8_t *str, uint16_t len)
+void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
 {
     if (len >= TOX_MAX_NAME_LENGTH || num < 0 || num >= num_friends)
         return;
@@ -218,7 +218,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
                 wattroff(self->window, COLOR_PAIR(colour) | A_BOLD);
                 wprintw(self->window, "]%s (%s)\n", friends[i].name, friends[i].statusmsg);
             } else {
-                wprintw(self->window, "[O]%s\n", friends[i].name, friends[i].statusmsg);
+                wprintw(self->window, "[O]%s\n", friends[i].name);
             }
         }
     }
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index 269ce2b..7df1f1c 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -43,7 +43,7 @@ struct ToxWindow_ {
     void(*onFriendRequest)(ToxWindow *, uint8_t *, uint8_t *, uint16_t);
     void(*onConnectionChange)(ToxWindow *, Tox *, int, uint8_t);
     void(*onMessage)(ToxWindow *, Tox *, int, uint8_t *, uint16_t);
-    void(*onNickChange)(ToxWindow *, Tox *, int, uint8_t *, uint16_t);
+    void(*onNickChange)(ToxWindow *, int, uint8_t *, uint16_t);
     void(*onStatusChange)(ToxWindow *, Tox *, int, TOX_USERSTATUS);
     void(*onStatusMessageChange)(ToxWindow *, int, uint8_t *, uint16_t);
     void(*onAction)(ToxWindow *, Tox *, int, uint8_t *, uint16_t);
diff --git a/src/windows.c b/src/windows.c
index bd490c9..17980ca 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -88,7 +88,7 @@ void on_nickchange(Tox *m, int friendnumber, uint8_t *string, uint16_t length, v
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onNickChange != NULL)
-            windows[i].onNickChange(&windows[i], m, friendnumber, string, length);
+            windows[i].onNickChange(&windows[i], friendnumber, string, length);
     }
 
     if (store_data(m, DATA_FILE))