diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 19d39c51b..16b3eb2ec 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -622,7 +622,7 @@ async fn add_parts(
     }
 
     // Extract ephemeral timer from the message.
-    let mut timer = if let Some(value) = mime_parser.get(HeaderDef::EphemeralTimer) {
+    let mut ephemeral_timer = if let Some(value) = mime_parser.get(HeaderDef::EphemeralTimer) {
         match value.parse::<EphemeralTimer>() {
             Ok(timer) => timer,
             Err(err) => {
@@ -649,14 +649,17 @@ async fn add_parts(
     if !*hidden
         && !location_kml_is
         && !is_mdn
-        && (*chat_id).get_ephemeral_timer(context).await? != timer
+        && (*chat_id).get_ephemeral_timer(context).await? != ephemeral_timer
     {
-        match (*chat_id).inner_set_ephemeral_timer(context, timer).await {
+        match (*chat_id)
+            .inner_set_ephemeral_timer(context, ephemeral_timer)
+            .await
+        {
             Ok(()) => {
                 if mime_parser.is_system_message == SystemMessage::EphemeralTimerChanged {
                     set_better_msg(
                         mime_parser,
-                        stock_ephemeral_timer_changed(context, timer, from_id).await,
+                        stock_ephemeral_timer_changed(context, ephemeral_timer, from_id).await,
                     );
 
                     // Do not delete the system message itself.
@@ -665,12 +668,12 @@ async fn add_parts(
                     // to 1 week, and then changed to 1 hour: after 1
                     // hour, only the message about the change to 1
                     // week is left.
-                    timer = EphemeralTimer::Disabled;
+                    ephemeral_timer = EphemeralTimer::Disabled;
                 } else {
                     chat::add_info_msg(
                         context,
                         *chat_id,
-                        stock_ephemeral_timer_changed(context, timer, from_id).await,
+                        stock_ephemeral_timer_changed(context, ephemeral_timer, from_id).await,
                     )
                     .await;
                 }
@@ -791,7 +794,7 @@ async fn add_parts(
                     mime_in_reply_to,
                     mime_references,
                     part.error,
-                    timer
+                    ephemeral_timer
                 ])?;
 
                 drop(stmt);