2 files changed, 3 insertions, 2 deletions

diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index f2b22967..cab238c8 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -206,7 +206,8 @@ START_TEST(test_getname)
     ck_assert(getname(m, REALLY_BIG_NUMBER, name_buf) == -1);
 
     memcpy(m->friendlist[0].name, &test_name[0], 3);
-    getname(m, 0, &name_buf[0]);
+    m->friendlist[0].name_length = 4;
+    ck_assert(getname(m, 0, &name_buf[0]) == 4);
 
     ck_assert(strcmp((char *)&name_buf[0], "foo") == 0);
 }
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 0823891a..9d7f17dc 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -32,7 +32,7 @@
 #include "LAN_discovery.h"
 
 #define MAX_NAME_LENGTH 128
-#define MAX_STATUSMESSAGE_LENGTH 128
+#define MAX_STATUSMESSAGE_LENGTH 1007
 
 #define FRIEND_ADDRESS_SIZE (crypto_box_PUBLICKEYBYTES + sizeof(uint32_t) + sizeof(uint16_t))