diff --git a/crates/teloxide-core/src/types/callback_query.rs b/crates/teloxide-core/src/types/callback_query.rs
index a31d61d7..4ab58252 100644
--- a/crates/teloxide-core/src/types/callback_query.rs
+++ b/crates/teloxide-core/src/types/callback_query.rs
@@ -68,7 +68,7 @@ impl CallbackQuery {
         self.message
             .as_ref()
             // If we can access the message
-            .and_then(|maybe| maybe.message())
+            .and_then(|maybe| maybe.regular_message())
     }
 }
 
diff --git a/crates/teloxide-core/src/types/maybe_inaccessible_message.rs b/crates/teloxide-core/src/types/maybe_inaccessible_message.rs
index 81e583aa..985ea1cb 100644
--- a/crates/teloxide-core/src/types/maybe_inaccessible_message.rs
+++ b/crates/teloxide-core/src/types/maybe_inaccessible_message.rs
@@ -21,17 +21,15 @@ impl MaybeInaccessibleMessage {
         }
     }
 
-    pub fn message(&self) -> Option<&Message> {
+    #[must_use]
+    pub fn regular_message(&self) -> Option<&Message> {
         match self {
             Self::Regular(message) => Some(message),
             Self::Inaccessible(_) => None,
         }
     }
 
-    pub fn chat_and_id(&self) -> (&Chat, MessageId) {
-        (self.chat(), self.id())
-    }
-
+    #[must_use]
     pub fn chat(&self) -> &Chat {
         match self {
             Self::Regular(message) => &message.chat,
diff --git a/crates/teloxide/examples/buttons.rs b/crates/teloxide/examples/buttons.rs
index 8a2269f7..daa538c2 100644
--- a/crates/teloxide/examples/buttons.rs
+++ b/crates/teloxide/examples/buttons.rs
@@ -116,9 +116,8 @@ async fn callback_handler(bot: Bot, q: CallbackQuery) -> Result<(), Box<dyn Erro
         bot.answer_callback_query(q.id).await?;
 
         // Edit text of the message to which the buttons were attached
-        if let Some(maybe_message) = q.message {
-            let (chat, id) = maybe_message.chat_and_id();
-            bot.edit_message_text(chat.id, id, text).await?;
+        if let Some(message) = q.message {
+            bot.edit_message_text(message.chat().id, message.id(), text).await?;
         } else if let Some(id) = q.inline_message_id {
             bot.edit_message_text_inline(id, text).await?;
         }