diff --git a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
index 1968dea6..e8a44f72 100644
--- a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
+++ b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
@@ -92,13 +92,17 @@ fun Recipient.parseName(): Recipient {
 
 fun Mailbox.toRecipient() = Recipient(
     mailboxGlobalKey = globalKey,
+    studentName = studentName,
     name = name,
+    schoolNameShort = schoolNameShort,
 )
 
 fun Recipient.toMailbox() = Mailbox(
     globalKey = mailboxGlobalKey,
     name = name,
     userType = -1,
+    studentName = studentName,
+    schoolNameShort = schoolNameShort,
 )
 
 fun String.capitalise() = replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }