3 files changed, 10 insertions, 4 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 846bed6d..a1abce41 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -462,15 +462,15 @@ int m_copy_statusmessage(Messenger *m, int friendnumber, uint8_t *buf, uint32_t
         return -1;
 
     memset(buf, 0, maxlen);
-    memcpy(buf, m->friendlist[friendnumber].statusmessage, MIN(maxlen, MAX_STATUSMESSAGE_LENGTH) - 1);
-    return 0;
+    memcpy(buf, m->friendlist[friendnumber].statusmessage, MIN(maxlen, m->friendlist[friendnumber].statusmessage_length));
+    return MIN(maxlen, m->friendlist[friendnumber].statusmessage_length);
 }
 
 int m_copy_self_statusmessage(Messenger *m, uint8_t *buf, uint32_t maxlen)
 {
     memset(buf, 0, maxlen);
-    memcpy(buf, m->statusmessage, MIN(maxlen, MAX_STATUSMESSAGE_LENGTH) - 1);
-    return 0;
+    memcpy(buf, m->statusmessage, MIN(maxlen, m->statusmessage_length));
+    return MIN(maxlen, m->statusmessage_length);
 }
 
 USERSTATUS m_get_userstatus(Messenger *m, int friendnumber)
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 9d7f17dc..a4c6114b 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -276,6 +276,9 @@ int m_get_statusmessage_size(Messenger *m, int friendnumber);
 /* Copy friendnumber's status message into buf, truncating if size is over maxlen.
  * Get the size you need to allocate from m_get_statusmessage_size.
  * The self variant will copy our own status message.
+ *
+ * returns the length of the copied data on success
+ * retruns -1 on failure.
  */
 int m_copy_statusmessage(Messenger *m, int friendnumber, uint8_t *buf, uint32_t maxlen);
 int m_copy_self_statusmessage(Messenger *m, uint8_t *buf, uint32_t maxlen);
diff --git a/toxcore/tox.h b/toxcore/tox.h
index e6cf0322..718f817b 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -204,6 +204,9 @@ int tox_get_statusmessage_size(Tox *tox, int friendnumber);
 /* Copy friendnumber's status message into buf, truncating if size is over maxlen.
  * Get the size you need to allocate from m_get_statusmessage_size.
  * The self variant will copy our own status message.
+ *
+ * returns the length of the copied data on success
+ * retruns -1 on failure.
  */
 int tox_copy_statusmessage(Tox *tox, int friendnumber, uint8_t *buf, uint32_t maxlen);
 int tox_copy_self_statusmessage(Tox *tox, uint8_t *buf, uint32_t maxlen);