diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp
index 91882ec2f..2d916efd2 100644
--- a/widgets/displaytext.cpp
+++ b/widgets/displaytext.cpp
@@ -437,8 +437,7 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con
     {
       extra += QString {"%1"}.arg (fSpread, 5, 'f', fSpread < 0.95 ? 3 : 2) + QChar {' '};
     }
-  auto ap_pos = message.lastIndexOf (QRegularExpression {R"((?:\?\s)?a[0-9]$)"});
-  if(ap_pos<0) ap_pos = message.lastIndexOf("q");     //Check for "q" decodes (used in Q65 only)
+  auto ap_pos = message.lastIndexOf (QRegularExpression {R"((?:\?\s)?(?:a[0-9]|q[0-9][0-9*]?)$)"});
   if (ap_pos >= 0)
     {
       extra += message.mid (ap_pos) + QChar {' '};