diff --git a/src/chat.rs b/src/chat.rs
index 2d8a4ce11..181991e19 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -926,7 +926,7 @@ impl ChatId {
     pub async fn set_encryption_modus(
         self,
         context: &Context,
-        modus: &EncryptionModus,
+        modus: EncryptionModus,
     ) -> Result<()> {
         context
             .sql
@@ -941,7 +941,7 @@ impl ChatId {
 
     /// This sets a protection modus for the chat and enforces that messages are only send if they
     /// meet the encryption modus (ForcePlaintext, Opportunistic, ForceEncrypted, ForceVerified)
-    pub async fn get_encryption_modus(self, context: &Context) -> Result<Option<EncryptionModus>> {
+    pub async fn encryption_modus(self, context: &Context) -> Result<Option<EncryptionModus>> {
         let encryption_modus: Option<EncryptionModus> = context
             .sql
             .query_get_value(
@@ -2001,8 +2001,8 @@ pub async fn is_contact_in_chat(
 pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result<MsgId> {
     // Propagate same encryption_mode of chat to message in case messages doesn't yet have an
     // encryption_mode
-    if let None = msg.get_encryption_modus(&context).await? {
-        if let Some(encryption_mode) = chat_id.get_encryption_modus(&context).await? {
+    if let None = msg.encryption_modus(&context).await? {
+        if let Some(encryption_mode) = chat_id.encryption_modus(&context).await? {
             msg.set_encryption_modus(&context, encryption_mode);
         }
     }
diff --git a/src/message.rs b/src/message.rs
index 76e5c126b..8a29bf44e 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -855,10 +855,10 @@ impl Message {
         self.param.set_int(Param::ForcePlaintext, 1);
     }
 
-    async fn set_encryption_modus(
+    pub async fn set_encryption_modus(
         &mut self,
         context: &Context,
-        encryption_modus: &EncryptionModus,
+        encryption_modus: EncryptionModus,
     ) -> Result<()> {
         context
             .sql
@@ -871,7 +871,7 @@ impl Message {
         Ok(())
     }
 
-    pub async fn get_encryption_modus(&self, context: &Context) -> Result<Option<EncryptionModus>> {
+    pub async fn encryption_modus(&self, context: &Context) -> Result<Option<EncryptionModus>> {
         let encryption_modus: Option<EncryptionModus> = context
             .sql
             .query_get_value(
diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index 90e2db251..f8cb5a9f6 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -605,7 +605,7 @@ impl<'a> MimeFactory<'a> {
 
         let min_verified = self.min_verified();
         let grpimage = self.grpimage();
-        let encryption_modus = match self.msg.get_encryption_modus(context).await? {
+        let encryption_modus = match self.msg.encryption_modus(context).await? {
             Some(encryption_modus) => encryption_modus,
             None => EncryptionModus::Opportunistic,
         };