diff --git a/packages/node-mimimi/src/importer.rs b/packages/node-mimimi/src/importer.rs
index efe11f9f04a..da12da10321 100644
--- a/packages/node-mimimi/src/importer.rs
+++ b/packages/node-mimimi/src/importer.rs
@@ -8,7 +8,7 @@ use tutasdk::crypto::aes::Iv;
 use tutasdk::crypto::key::{GenericAesKey, VersionedAesKey};
 use tutasdk::crypto::randomizer_facade::RandomizerFacade;
 use tutasdk::entities::tutanota::DraftCreateData;
-use tutasdk::services::tutanota::DraftService;
+use tutasdk::services::tutanota::ImportMailService;
 use tutasdk::services::ExtraServiceParams;
 use tutasdk::{ApiCallError, LoggedInSdk};
 
@@ -180,7 +180,7 @@ impl ImporterInner {
 		let draft_return_data = self
 			.logged_in_sdk
 			.get_service_executor()
-			.post::<DraftService>(create_draft_data, service_params)
+			.post::<ImportMailService>(create_draft_data, service_params)
 			.await
 			.expect("Cannot execute DraftService");
 
diff --git a/tuta-sdk/rust/sdk/src/services/tutanota.rs b/tuta-sdk/rust/sdk/src/services/tutanota.rs
index 085239ef280..e750e4ce2c1 100644
--- a/tuta-sdk/rust/sdk/src/services/tutanota.rs
+++ b/tuta-sdk/rust/sdk/src/services/tutanota.rs
@@ -1,14 +1,13 @@
 #![allow(unused_imports, dead_code, unused_variables)]
-use crate::ApiCallError;
-use crate::entities::Entity;
-use crate::services::{PostService, GetService, PutService, DeleteService, Service, Executor, ExtraServiceParams};
-use crate::rest_client::HttpMethod;
-use crate::services::hidden::Nothing;
-use crate::entities::tutanota::UserAreaGroupPostData;
-use crate::entities::tutanota::CreateGroupPostReturn;
 use crate::entities::tutanota::CalendarDeleteData;
-use crate::entities::tutanota::UserAreaGroupDeleteData;
+use crate::entities::tutanota::CreateGroupPostReturn;
+use crate::entities::tutanota::CreateMailFolderData;
+use crate::entities::tutanota::CreateMailFolderReturn;
+use crate::entities::tutanota::CreateMailGroupData;
 use crate::entities::tutanota::CustomerAccountCreateData;
+use crate::entities::tutanota::DeleteGroupData;
+use crate::entities::tutanota::DeleteMailData;
+use crate::entities::tutanota::DeleteMailFolderData;
 use crate::entities::tutanota::DraftCreateData;
 use crate::entities::tutanota::DraftCreateReturn;
 use crate::entities::tutanota::DraftUpdateData;
@@ -16,20 +15,11 @@ use crate::entities::tutanota::DraftUpdateReturn;
 use crate::entities::tutanota::EncryptTutanotaPropertiesData;
 use crate::entities::tutanota::EntropyData;
 use crate::entities::tutanota::ExternalUserData;
+use crate::entities::tutanota::GroupInvitationDeleteData;
 use crate::entities::tutanota::GroupInvitationPostData;
 use crate::entities::tutanota::GroupInvitationPostReturn;
 use crate::entities::tutanota::GroupInvitationPutData;
-use crate::entities::tutanota::GroupInvitationDeleteData;
-use crate::entities::tutanota::ImportMailPostIn;
-use crate::entities::tutanota::ImportMailPostOut;
 use crate::entities::tutanota::ListUnsubscribeData;
-use crate::entities::tutanota::CreateMailFolderData;
-use crate::entities::tutanota::CreateMailFolderReturn;
-use crate::entities::tutanota::UpdateMailFolderData;
-use crate::entities::tutanota::DeleteMailFolderData;
-use crate::entities::tutanota::CreateMailGroupData;
-use crate::entities::tutanota::DeleteGroupData;
-use crate::entities::tutanota::DeleteMailData;
 use crate::entities::tutanota::MoveMailData;
 use crate::entities::tutanota::NewsIn;
 use crate::entities::tutanota::NewsOut;
@@ -41,150 +31,226 @@ use crate::entities::tutanota::SimpleMoveMailPostIn;
 use crate::entities::tutanota::TranslationGetIn;
 use crate::entities::tutanota::TranslationGetOut;
 use crate::entities::tutanota::UnreadMailStatePostIn;
+use crate::entities::tutanota::UpdateMailFolderData;
 use crate::entities::tutanota::UserAccountCreateData;
+use crate::entities::tutanota::UserAreaGroupDeleteData;
+use crate::entities::tutanota::UserAreaGroupPostData;
+use crate::services::{DeleteService, Executor, GetService, PostService, PutService};
 pub struct CalendarService;
 
 crate::service_impl!(declare, CalendarService, "tutanota/calendarservice", 77);
-crate::service_impl!(POST, CalendarService, UserAreaGroupPostData, CreateGroupPostReturn);
+crate::service_impl!(
+	POST,
+	CalendarService,
+	UserAreaGroupPostData,
+	CreateGroupPostReturn
+);
 crate::service_impl!(DELETE, CalendarService, CalendarDeleteData, ());
 
-
 pub struct ContactListGroupService;
 
-crate::service_impl!(declare, ContactListGroupService, "tutanota/contactlistgroupservice", 77);
-crate::service_impl!(POST, ContactListGroupService, UserAreaGroupPostData, CreateGroupPostReturn);
+crate::service_impl!(
+	declare,
+	ContactListGroupService,
+	"tutanota/contactlistgroupservice",
+	77
+);
+crate::service_impl!(
+	POST,
+	ContactListGroupService,
+	UserAreaGroupPostData,
+	CreateGroupPostReturn
+);
 crate::service_impl!(DELETE, ContactListGroupService, UserAreaGroupDeleteData, ());
 
-
 pub struct CustomerAccountService;
 
-crate::service_impl!(declare, CustomerAccountService, "tutanota/customeraccountservice", 77);
+crate::service_impl!(
+	declare,
+	CustomerAccountService,
+	"tutanota/customeraccountservice",
+	77
+);
 crate::service_impl!(POST, CustomerAccountService, CustomerAccountCreateData, ());
 
-
 pub struct DraftService;
 
 crate::service_impl!(declare, DraftService, "tutanota/draftservice", 77);
 crate::service_impl!(POST, DraftService, DraftCreateData, DraftCreateReturn);
 crate::service_impl!(PUT, DraftService, DraftUpdateData, DraftUpdateReturn);
 
-
 pub struct EncryptTutanotaPropertiesService;
 
-crate::service_impl!(declare, EncryptTutanotaPropertiesService, "tutanota/encrypttutanotapropertiesservice", 77);
-crate::service_impl!(POST, EncryptTutanotaPropertiesService, EncryptTutanotaPropertiesData, ());
-
+crate::service_impl!(
+	declare,
+	EncryptTutanotaPropertiesService,
+	"tutanota/encrypttutanotapropertiesservice",
+	77
+);
+crate::service_impl!(
+	POST,
+	EncryptTutanotaPropertiesService,
+	EncryptTutanotaPropertiesData,
+	()
+);
 
 pub struct EntropyService;
 
 crate::service_impl!(declare, EntropyService, "tutanota/entropyservice", 77);
 crate::service_impl!(PUT, EntropyService, EntropyData, ());
 
-
 pub struct ExternalUserService;
 
-crate::service_impl!(declare, ExternalUserService, "tutanota/externaluserservice", 77);
+crate::service_impl!(
+	declare,
+	ExternalUserService,
+	"tutanota/externaluserservice",
+	77
+);
 crate::service_impl!(POST, ExternalUserService, ExternalUserData, ());
 
-
 pub struct GroupInvitationService;
 
-crate::service_impl!(declare, GroupInvitationService, "tutanota/groupinvitationservice", 77);
-crate::service_impl!(POST, GroupInvitationService, GroupInvitationPostData, GroupInvitationPostReturn);
+crate::service_impl!(
+	declare,
+	GroupInvitationService,
+	"tutanota/groupinvitationservice",
+	77
+);
+crate::service_impl!(
+	POST,
+	GroupInvitationService,
+	GroupInvitationPostData,
+	GroupInvitationPostReturn
+);
 crate::service_impl!(PUT, GroupInvitationService, GroupInvitationPutData, ());
-crate::service_impl!(DELETE, GroupInvitationService, GroupInvitationDeleteData, ());
-
+crate::service_impl!(
+	DELETE,
+	GroupInvitationService,
+	GroupInvitationDeleteData,
+	()
+);
 
 pub struct ImportMailService;
 
 crate::service_impl!(declare, ImportMailService, "tutanota/importmailservice", 77);
-crate::service_impl!(POST, ImportMailService, ImportMailPostIn, ImportMailPostOut);
-
 
 pub struct ListUnsubscribeService;
 
-crate::service_impl!(declare, ListUnsubscribeService, "tutanota/listunsubscribeservice", 77);
+crate::service_impl!(
+	declare,
+	ListUnsubscribeService,
+	"tutanota/listunsubscribeservice",
+	77
+);
 crate::service_impl!(POST, ListUnsubscribeService, ListUnsubscribeData, ());
 
-
 pub struct MailFolderService;
 
 crate::service_impl!(declare, MailFolderService, "tutanota/mailfolderservice", 77);
-crate::service_impl!(POST, MailFolderService, CreateMailFolderData, CreateMailFolderReturn);
+crate::service_impl!(
+	POST,
+	MailFolderService,
+	CreateMailFolderData,
+	CreateMailFolderReturn
+);
 crate::service_impl!(PUT, MailFolderService, UpdateMailFolderData, ());
 crate::service_impl!(DELETE, MailFolderService, DeleteMailFolderData, ());
 
-
 pub struct MailGroupService;
 
 crate::service_impl!(declare, MailGroupService, "tutanota/mailgroupservice", 77);
 crate::service_impl!(POST, MailGroupService, CreateMailGroupData, ());
 crate::service_impl!(DELETE, MailGroupService, DeleteGroupData, ());
 
-
 pub struct MailService;
 
 crate::service_impl!(declare, MailService, "tutanota/mailservice", 77);
 crate::service_impl!(DELETE, MailService, DeleteMailData, ());
 
-
 pub struct MoveMailService;
 
 crate::service_impl!(declare, MoveMailService, "tutanota/movemailservice", 77);
 crate::service_impl!(POST, MoveMailService, MoveMailData, ());
 
-
 pub struct NewsService;
 
 crate::service_impl!(declare, NewsService, "tutanota/newsservice", 77);
 crate::service_impl!(POST, NewsService, NewsIn, ());
 crate::service_impl!(GET, NewsService, (), NewsOut);
 
-
 pub struct ReceiveInfoService;
 
-crate::service_impl!(declare, ReceiveInfoService, "tutanota/receiveinfoservice", 77);
+crate::service_impl!(
+	declare,
+	ReceiveInfoService,
+	"tutanota/receiveinfoservice",
+	77
+);
 crate::service_impl!(POST, ReceiveInfoService, ReceiveInfoServiceData, ());
 
-
 pub struct ReportMailService;
 
 crate::service_impl!(declare, ReportMailService, "tutanota/reportmailservice", 77);
 crate::service_impl!(POST, ReportMailService, ReportMailPostData, ());
 
-
 pub struct SendDraftService;
 
 crate::service_impl!(declare, SendDraftService, "tutanota/senddraftservice", 77);
 crate::service_impl!(POST, SendDraftService, SendDraftData, SendDraftReturn);
 
-
 pub struct SimpleMoveMailService;
 
-crate::service_impl!(declare, SimpleMoveMailService, "tutanota/simplemovemailservice", 77);
+crate::service_impl!(
+	declare,
+	SimpleMoveMailService,
+	"tutanota/simplemovemailservice",
+	77
+);
 crate::service_impl!(POST, SimpleMoveMailService, SimpleMoveMailPostIn, ());
 
-
 pub struct TemplateGroupService;
 
-crate::service_impl!(declare, TemplateGroupService, "tutanota/templategroupservice", 77);
-crate::service_impl!(POST, TemplateGroupService, UserAreaGroupPostData, CreateGroupPostReturn);
+crate::service_impl!(
+	declare,
+	TemplateGroupService,
+	"tutanota/templategroupservice",
+	77
+);
+crate::service_impl!(
+	POST,
+	TemplateGroupService,
+	UserAreaGroupPostData,
+	CreateGroupPostReturn
+);
 crate::service_impl!(DELETE, TemplateGroupService, UserAreaGroupDeleteData, ());
 
-
 pub struct TranslationService;
 
-crate::service_impl!(declare, TranslationService, "tutanota/translationservice", 77);
+crate::service_impl!(
+	declare,
+	TranslationService,
+	"tutanota/translationservice",
+	77
+);
 crate::service_impl!(GET, TranslationService, TranslationGetIn, TranslationGetOut);
 
-
 pub struct UnreadMailStateService;
 
-crate::service_impl!(declare, UnreadMailStateService, "tutanota/unreadmailstateservice", 77);
+crate::service_impl!(
+	declare,
+	UnreadMailStateService,
+	"tutanota/unreadmailstateservice",
+	77
+);
 crate::service_impl!(POST, UnreadMailStateService, UnreadMailStatePostIn, ());
 
-
 pub struct UserAccountService;
 
-crate::service_impl!(declare, UserAccountService, "tutanota/useraccountservice", 77);
+crate::service_impl!(
+	declare,
+	UserAccountService,
+	"tutanota/useraccountservice",
+	77
+);
 crate::service_impl!(POST, UserAccountService, UserAccountCreateData, ());