1 files changed, 4 insertions, 2 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 07893e02..3757faf3 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -346,7 +346,7 @@ static int m_sendname(Messenger *m, int friendnumber, uint8_t *name, uint16_t le
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_NICKNAME, name, length);
 }
 
-/* Set the name of a friend.
+/* Set the name and name_length of a friend.
  *
  *  return 0 if success.
  *  return -1 if failure.
@@ -356,7 +356,9 @@ static int setfriendname(Messenger *m, int friendnumber, uint8_t *name)
     if (friend_not_valid(m, friendnumber))
         return -1;
 
-    memcpy(m->friendlist[friendnumber].name, name, MAX_NAME_LENGTH);
+    uint16_t len = strlen(name) + 1;
+    m->friendlist[friendnumber].name_length = len;
+    memcpy(m->friendlist[friendnumber].name, name, len);
     return 0;
 }