diff --git a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
index 4e7ac4e582..8ca1bd2417 100644
--- a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
@@ -42,8 +42,8 @@ import com.infomaniak.mail.data.models.correspondent.Contact
 import com.infomaniak.mail.data.models.correspondent.Recipient
 import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.draft.SaveDraftResult
+import com.infomaniak.mail.data.models.draft.ScheduleDraftResult
 import com.infomaniak.mail.data.models.draft.SendDraftResult
-import com.infomaniak.mail.data.models.draft.SendScheduleDraftResult
 import com.infomaniak.mail.data.models.getMessages.ActivitiesResult
 import com.infomaniak.mail.data.models.getMessages.GetMessagesByUidsResult
 import com.infomaniak.mail.data.models.getMessages.NewMessagesResult
@@ -193,13 +193,13 @@ object ApiRepository : ApiRepositoryCore() {
         return draft.remoteUuid?.let(::putDraft) ?: run(::postDraft)
     }
 
-    fun sendScheduleDraft(mailboxUuid: String, draft: Draft, okHttpClient: OkHttpClient): ApiResponse<SendScheduleDraftResult> {
+    fun scheduleDraft(mailboxUuid: String, draft: Draft, okHttpClient: OkHttpClient): ApiResponse<ScheduleDraftResult> {
 
         val body = getDraftBody(draft)
 
-        fun postDraft(): ApiResponse<SendScheduleDraftResult> = callApi(ApiRoutes.draft(mailboxUuid), POST, body, okHttpClient)
+        fun postDraft(): ApiResponse<ScheduleDraftResult> = callApi(ApiRoutes.draft(mailboxUuid), POST, body, okHttpClient)
 
-        fun putDraft(uuid: String): ApiResponse<SendScheduleDraftResult> =
+        fun putDraft(uuid: String): ApiResponse<ScheduleDraftResult> =
             callApi(ApiRoutes.draft(mailboxUuid, uuid), PUT, body, okHttpClient)
 
         return draft.remoteUuid?.let(::putDraft) ?: run(::postDraft)
diff --git a/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt b/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
index 89cc52f1cb..1911ff20ce 100644
--- a/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
@@ -228,12 +228,12 @@ object ApiRoutes {
     }
 
     fun scheduleDraft(scheduleAction: String): String {
-        return "$MAIL_API$scheduleAction"
+        return "${MAIL_API}${scheduleAction}"
     }
 
     fun rescheduleDraft(draftResource: String, scheduleDate: Date): String {
         val formatedDate = scheduleDate.format(FORMAT_SCHEDULE_MAIL)
-        return "$MAIL_API$draftResource/schedule?schedule_date=${URLEncoder.encode(formatedDate, "UTF-8")}"
+        return "${MAIL_API}${draftResource}/schedule?schedule_date=${URLEncoder.encode(formatedDate, "UTF-8")}"
     }
 
     fun createAttachment(mailboxUuid: String): String {
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/draft/SendScheduleDraftResult.kt b/app/src/main/java/com/infomaniak/mail/data/models/draft/ScheduleDraftResult.kt
similarity index 96%
rename from app/src/main/java/com/infomaniak/mail/data/models/draft/SendScheduleDraftResult.kt
rename to app/src/main/java/com/infomaniak/mail/data/models/draft/ScheduleDraftResult.kt
index 04d7e0b80d..369087f9ce 100644
--- a/app/src/main/java/com/infomaniak/mail/data/models/draft/SendScheduleDraftResult.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/models/draft/ScheduleDraftResult.kt
@@ -22,7 +22,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class SendScheduleDraftResult(
+data class ScheduleDraftResult(
     val uuid: String,
     @SerialName("schedule_action")
     val scheduleAction: String,
diff --git a/app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt b/app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt
index f1e31e9a0e..d093a7c32b 100644
--- a/app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt
+++ b/app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt
@@ -376,7 +376,7 @@ class DraftsActionsWorker @AssistedInject constructor(
             }
         }
 
-        suspend fun executeScheduleSendAction() = with(ApiRepository.sendScheduleDraft(mailboxUuid, draft, okHttpClient)) {
+        suspend fun executeScheduleSendAction() = with(ApiRepository.scheduleDraft(mailboxUuid, draft, okHttpClient)) {
             when {
                 isSuccess() -> {
                     scheduleAction = data?.scheduleAction