diff --git a/src/contact.rs b/src/contact.rs
index c919cee59..f071eb99c 100644
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -218,6 +218,7 @@ impl Contact {
         } else if contact_id == DC_CONTACT_ID_DEVICE {
             contact.name = stock_str::device_messages(context).await;
             contact.addr = DC_CONTACT_ID_DEVICE_ADDR.to_string();
+            contact.status = stock_str::device_messages_hint(context).await;
         }
         Ok(contact)
     }
diff --git a/src/stock_str.rs b/src/stock_str.rs
index a4e2776a7..aae80ded4 100644
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -897,10 +897,6 @@ impl Context {
 
         // add welcome-messages. by the label, this is done only once,
         // if the user has deleted the message or the chat, it is not added again.
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(device_messages_hint(self).await);
-        chat::add_device_msg(self, Some("core-about-device-chat"), Some(&mut msg)).await?;
-
         let image = include_bytes!("../assets/welcome-image.jpg");
         let blob = BlobObject::create(self, "welcome-image.jpg", image).await?;
         let mut msg = Message::new(Viewtype::Image);