diff --git a/actions/showmessage.php b/actions/showmessage.php
index 28e3594506..c171ffe0b5 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -27,9 +27,7 @@ class ShowmessageAction extends MailboxAction {
 
 		Action::handle($args);
 
-		$id = $this->trimmed('message');
-
-		$message = Message::staticGet('message', $id);
+		$message = $this->get_message();
 
 		if (!$message) {
 			$this->client_error(_('No such message.'), 404);