diff --git a/scripts/doc/web-demo/demo.py b/scripts/doc/web-demo/demo.py
index 636db983..c5c02a16 100644
--- a/scripts/doc/web-demo/demo.py
+++ b/scripts/doc/web-demo/demo.py
@@ -58,6 +58,10 @@ _CHANNELS = [
     dict(slot=1, t=-1, n="Emergency"),
 ]
 
+# Recent-heard mention candidates, newest first. Includes punctuation and HTML
+# metacharacters so the browser demo proves labels are rendered as text.
+_MENTION_NAMES = ["Sanne", "Sam <Ops>", "R&D \"QA\"", "Diego", "Marta", "Noah"]
+
 # ---------------------------------------------------------------------------
 # Messages per thread  (webPushMessages: msgs[] fields o,ts,ds,pl,sn,rs,rp,s,x)
 #   o  = outgoing (1) / incoming (0)
@@ -151,6 +155,10 @@ def contacts_payload(now):
     return {"t": "c", "dc": len(_DISCOVERED), "contacts": out, "channels": channels}
 
 
+def mentions_payload(request_id):
+    return {"t": "mh", "q": request_id, "names": list(_MENTION_NAMES)}
+
+
 def _thread_last(tidx):
     msgs = _MESSAGES.get(tidx, [])
     return msgs[-1] if msgs else None
diff --git a/scripts/doc/web-demo/index.html b/scripts/doc/web-demo/index.html
index e48df383..9cd12713 100644
--- a/scripts/doc/web-demo/index.html
+++ b/scripts/doc/web-demo/index.html
@@ -28,10 +28,13 @@
 .b.in{align-self:flex-start;background:#17181b}.b.out{align-self:flex-end;background:#123f3a}
 .bname{font-size:11px;color:#19d6c2;margin-bottom:2px}.btext{white-space:pre-wrap}
 .bmeta{font-size:10px;color:#8a9095;text-align:right;margin-top:2px}
-.cb{display:flex;border-top:1px solid #1c1c1f;padding:8px;gap:8px}
-.cb input{flex:1;background:#111214;color:#e8e8ea;border:1px solid #2a2a2e;border-radius:18px;padding:9px 14px;font:inherit;outline:none}
+.cb{display:flex;border-top:1px solid #1c1c1f;padding:8px;gap:8px;position:relative}.cwrap{position:relative;flex:1;min-width:0}
+.cb input{width:100%;background:#111214;color:#e8e8ea;border:1px solid #2a2a2e;border-radius:18px;padding:9px 14px;font:inherit;outline:none}
 .cb input:focus{border-color:#19d6c2}
 .cb button{background:#19d6c2;color:#04201d;border:none;border-radius:18px;padding:0 16px;font-weight:700;cursor:pointer}
+#mnames{display:none;position:absolute;left:0;right:0;bottom:calc(100% + 6px);z-index:12;background:#151619;border:1px solid #2a2a2e;border-radius:8px;box-shadow:0 5px 18px rgba(0,0,0,.5);overflow:hidden}
+#mnames.on{display:block}#mnames button{display:block;width:100%;border:0;border-bottom:1px solid #202225;border-radius:0;background:#151619;color:#d7dbdd;text-align:left;padding:9px 13px;font:inherit;cursor:pointer}
+#mnames button:last-child{border-bottom:0}#mnames button.on{background:#17342f;color:#19d6c2}
 #o{flex:1;overflow-y:auto;padding:10px 12px;white-space:pre-wrap;word-break:break-word;line-height:1.4;font-family:'JetBrains Mono',Menlo,monospace;font-size:13px}
 #tbar{display:flex;border-top:1px solid #1c1c1f;padding:8px 10px;gap:8px;align-items:center}
 #p{color:#19d6c2;font-weight:700}
@@ -78,7 +81,7 @@
  <div id=cview style=display:none>
   <div id=cvh><button id=cvback>&lsaquo;</button><span id=cvname></span></div>
   <div id=cvmsgs></div>
-  <div class=cb><input id=cvi placeholder='Message' autocomplete=off><button id=cvsend>Send</button></div>
+  <div class=cb><div class=cwrap><input id=cvi maxlength=160 placeholder='Message' autocomplete=off><div id=mnames></div></div><button id=cvsend>Send</button></div>
  </div>
 </div>
 <div id=pcontacts class=pane style=display:none>
@@ -96,6 +99,7 @@
 <div id=toast></div>
 <script>
 var WS,dec=new TextDecoder(),curTab='chats',chat=null,threads=[],contacts=[],channels=[];
+var mentionNames=[],mentionMatches=[],mentionSel=0,mentionReq=0;
 var csort=0,cfilter=0,csearchq='',self={la:0,lo:0},lpAt=0,useMi=0,discCount=0;
 var SORTL=['Recent','A-Z','Distance'],FILTL=['All','Repeaters','Peers','Favorites','Located','Direct'];
 function age(ts){if(!ts||ts<1000000000)return'';var s=Math.floor(Date.now()/1000)-ts;if(s<0)s=0;if(s<60)return'now';if(s<3600)return Math.floor(s/60)+'m';if(s<86400)return Math.floor(s/3600)+'h';if(s<604800)return Math.floor(s/86400)+'d';return Math.floor(s/604800)+'w'}
@@ -108,6 +112,16 @@ function fmtDate(t){return (t>1000000000)?new Date(t*1000).toLocaleString():'--'
 function stat(t,k){var el=E('dot');el.style.color=(k=='ok')?'#19d6c2':((k=='err')?'#ff6b6b':'#63696e');el.title=t}
 function wsSend(s){if(WS&&WS.readyState==1){WS.send(s);return true}return false}
 function cById(i){for(var k=0;k<contacts.length;k++)if(contacts[k].i==i)return contacts[k];return null}
+function mentionHide(){mentionMatches=[];mentionSel=0;var b=E('mnames');b.classList.remove('on');b.innerHTML=''}
+function mentionToken(){var i=E('cvi'),v=i.value,p=i.selectionStart;if(p==null)return null;var a=p,found=false,punc=',.;:!?()[]{}<>';
+ while(a>0){var c=v.charAt(a-1);if(c=='@'){a--;found=true;break}if(' \n\t\r'.indexOf(c)>=0||punc.indexOf(c)>=0)return null;a--}
+ if(!found||(a>0&&' \n\t\r'.indexOf(v.charAt(a-1))<0))return null;var end=p;while(end<v.length&&' \n\t\r'.indexOf(v.charAt(end))<0&&punc.indexOf(v.charAt(end))<0)end++;return{a:a,p:p,e:end,q:v.slice(a+1,p)}}
+function mentionPaint(){var b=E('mnames');b.innerHTML='';if(!mentionMatches.length){mentionHide();return}
+ mentionMatches.forEach(function(n,idx){var x=document.createElement('button');x.type='button';x.textContent='@'+n;if(idx==mentionSel)x.className='on';x.onmousedown=function(e){e.preventDefault()};x.onclick=function(){mentionPick(n)};b.appendChild(x)});b.classList.add('on')}
+function mentionRefresh(){var t=mentionToken();if(!t){mentionHide();return}var q=t.q.toLowerCase();mentionMatches=mentionNames.filter(function(n){return n.toLowerCase().indexOf(q)==0}).slice(0,6);if(mentionSel>=mentionMatches.length)mentionSel=0;mentionPaint()}
+function mentionPick(n){var i=E('cvi'),t=mentionToken();if(!t)return mentionHide();var v=i.value,sp=t.e==v.length?' ':'';i.value=v.slice(0,t.a)+'@'+n+sp+v.slice(t.e);var p=t.a+1+n.length+sp.length;mentionHide();i.focus();i.setSelectionRange(p,p)}
+function mentionMove(d){if(!mentionMatches.length)return;mentionSel=(mentionSel+d+mentionMatches.length)%mentionMatches.length;mentionPaint()}
+function mentionRequest(){if(!chat)return;mentionReq++;wsSend('@mh '+mentionReq)}
 function showTab(t){curTab=t;['chats','contacts','term'].forEach(function(x){E('p'+x).style.display=(x==t)?'':'none'});
  each(document.querySelectorAll('#tabs button'),function(b){b.className=(b.getAttribute('data-t')==t)?'on':''});
  if(t=='chats'){if(!chat){closeChat();wsSend('@t')}}else if(t=='contacts'){wsSend('@c')}else if(t=='term'){E('i').focus()}}
@@ -181,12 +195,13 @@ function tsend(){var v=E('i').value;E('i').value='';if(!v.trim())return;if(v.tri
 function onData(s){var d;try{d=JSON.parse(s)}catch(_){return}
  if(d.t=='t'){onThreads(d.threads||[])}
  else if(d.t=='c'){contacts=d.contacts||[];channels=d.channels||[];discCount=d.dc||0;renderContacts()}
+ else if(d.t=='mh'){if(+d.q==mentionReq){mentionNames=d.names||[];mentionRefresh()}}
  else if(d.t=='m'){openChatView(d)}
  else if(d.t=='st'){renderStatus(d)}
  else if(d.t=='ci'){showContactInfo(d)}
  else if(d.t=='dc'){showDiscovered(d.nodes||[])}
  else if(d.t=='sg'){showSettings(d)}
- else if(d.t=='rx'){wsSend('@t');if(chat&&chat.i>=0)wsSend('@m '+chat.i);if(curTab=='contacts')wsSend('@c')}}
+ else if(d.t=='rx'){wsSend('@t');if(chat&&chat.i>=0)wsSend('@m '+chat.i);if(chat)mentionRequest();if(curTab=='contacts')wsSend('@c')}}
 function renderThreads(){var h='';if(!threads.length)h='<div class=empty>No chats yet.<br>Start one from Contacts.</div>';
  threads.sort(function(a,b){return (b.ts||0)-(a.ts||0)});
  threads.forEach(function(t){var bd=t.u>0?'<span class=badge>'+t.u+'</span>':'';
@@ -243,12 +258,12 @@ function openChatView(d){var box=E('cvmsgs');var wasBottom=(box.scrollHeight-box
   var nm=(!m.o&&chat.ch)?'<div class=bname>'+esc(m.s)+'</div>':'';
   h+='<div class="'+cls+'" data-mi='+i+'>'+nm+'<div class=btext>'+esc(m.x)+'</div><div class=bmeta>'+meta+'</div></div>'});
  E('cvmsgs').innerHTML=h;if(!same||wasBottom)E('cvmsgs').scrollTop=E('cvmsgs').scrollHeight;
- each(E('cvmsgs').querySelectorAll('.b'),function(b){var m=arr[+b.getAttribute('data-mi')];longPress(b,function(){if(m)msgSheet(m)})})}
-function closeChat(){chat=null;E('cview').style.display='none';E('tlist').style.display=''}
-function chatSend(){var v=E('cvi').value.trim();if(!v||!chat)return;E('cvi').value='';
+ each(E('cvmsgs').querySelectorAll('.b'),function(b){var m=arr[+b.getAttribute('data-mi')];longPress(b,function(){if(m)msgSheet(m)})});if(!same)mentionRequest()}
+function closeChat(){mentionHide();chat=null;E('cview').style.display='none';E('tlist').style.display=''}
+function chatSend(){mentionHide();var v=E('cvi').value.trim();if(!v||!chat)return;E('cvi').value='';
  if(chat.i>=0)wsSend('@s '+chat.i+' '+v);else if(chat.c!=null)wsSend('@sc '+chat.c+' '+v);else if(chat.h!=null)wsSend('@sh '+chat.h+' '+v)}
 function conn(){WS=new WebSocket((location.protocol=='https:'?'wss://':'ws://')+location.host+'/term');WS.binaryType='arraybuffer';
- WS.onopen=function(){stat('online','ok');wsSend('@st');if(curTab=='chats')wsSend('@t')};
+ WS.onopen=function(){stat('online','ok');wsSend('@st');if(curTab=='chats')wsSend('@t');if(chat)mentionRequest()};
  WS.onclose=function(){stat('reconnecting...','err');setTimeout(conn,1500)};WS.onerror=function(){stat('error','err')};
  WS.onmessage=function(e){var b=new Uint8Array(e.data);if(!b.length)return;var ty=b[0],p=dec.decode(b.subarray(1));if(ty==0)tadd(p);else if(ty==1)onData(p)}}
 each(document.querySelectorAll('#tabs button'),function(b){b.onclick=function(){showTab(b.getAttribute('data-t'))}});
@@ -257,7 +272,9 @@ E('csort').onclick=function(){sheet('Sort by',SORTL.map(function(s,i){return {la
 E('cfilt').onclick=function(){sheet('Filter',FILTL.map(function(f,i){return {label:(i==cfilter?'\u2713 ':'')+f,fn:function(){cfilter=i;renderContacts()}}}))};
 E('csearch').addEventListener('input',function(){csearchq=E('csearch').value.trim().toLowerCase();renderContacts()});
 E('cvback').onclick=function(){closeChat();wsSend('@t')};E('cvsend').onclick=chatSend;
-E('cvi').addEventListener('keydown',function(e){if(e.key=='Enter'){chatSend();e.preventDefault()}});
+E('cvi').addEventListener('input',mentionRefresh);E('cvi').addEventListener('click',mentionRefresh);
+E('cvi').addEventListener('blur',function(){setTimeout(mentionHide,120)});
+E('cvi').addEventListener('keydown',function(e){if(mentionMatches.length){if(e.key=='ArrowDown'){mentionMove(1);e.preventDefault();return}if(e.key=='ArrowUp'){mentionMove(-1);e.preventDefault();return}if(e.key=='Enter'||e.key=='Tab'){mentionPick(mentionMatches[mentionSel]);e.preventDefault();return}if(e.key=='Escape'){mentionHide();e.preventDefault();return}}if(e.key=='Enter'){chatSend();e.preventDefault()}});
 E('i').addEventListener('keydown',function(e){if(e.key=='Enter'){tsend();e.preventDefault()}
  else if(e.key=='ArrowUp'){if(hi>0){hi--;E('i').value=hist[hi];e.preventDefault()}}
  else if(e.key=='ArrowDown'){if(hi<hist.length-1){hi++;E('i').value=hist[hi]}else{hi=hist.length;E('i').value=''}e.preventDefault()}
diff --git a/scripts/doc/web-demo/serve.py b/scripts/doc/web-demo/serve.py
index 4eef45e9..76364b7e 100644
--- a/scripts/doc/web-demo/serve.py
+++ b/scripts/doc/web-demo/serve.py
@@ -74,6 +74,8 @@ def dispatch(cmd):
         return ("json", demo.settings_payload(now))
     if is_word("st"):
         return ("json", demo.status_payload(now))
+    if is_word("mh"):
+        return ("json", demo.mentions_payload(int_arg(2)))
     if a.startswith("m "):
         return ("json", demo.messages_payload(now, int_arg(2)))
     if a.startswith("oc "):
diff --git a/scripts/doc/web-demo/shoot.js b/scripts/doc/web-demo/shoot.js
index a6ccc23f..a1c96b41 100644
--- a/scripts/doc/web-demo/shoot.js
+++ b/scripts/doc/web-demo/shoot.js
@@ -2,6 +2,7 @@
 // Start the demo server first:  python3 scripts/doc/web-demo/serve.py 8791
 // Then:  NODE_PATH=<playwright node_modules> node scripts/doc/web-demo/shoot.js [port] [outdir]
 const { chromium } = require('playwright');
+const assert = require('assert');
 
 const PORT = process.argv[2] || '8791';
 const OUT  = process.argv[3] || 'doc-shots';
@@ -11,7 +12,10 @@ const path = require('path');
 const sleep = (ms) => new Promise(r => setTimeout(r, ms));
 
 (async () => {
-  const browser = await chromium.launch();
+  const launchOptions = process.env.PLAYWRIGHT_EXECUTABLE_PATH
+    ? { executablePath: process.env.PLAYWRIGHT_EXECUTABLE_PATH }
+    : {};
+  const browser = await chromium.launch(launchOptions);
   const page = await browser.newPage({
     viewport: { width: 390, height: 780 },
     deviceScaleFactor: 2,           // crisp @2x for docs
@@ -35,6 +39,31 @@ const sleep = (ms) => new Promise(r => setTimeout(r, ms));
   await page.waitForSelector('#cvmsgs .b', { timeout: 5000 });
   await sleep(500);
   await shot('chat');
+
+  // Mention autocomplete: recent-first filtering, keyboard selection, escaped
+  // labels, and replacement around a caret in the middle of existing text.
+  await page.fill('#cvi', '@sa');
+  await page.waitForSelector('#mnames.on button', { timeout: 5000 });
+  assert.deepStrictEqual(await page.locator('#mnames button').allTextContents(), ['@Sanne', '@Sam <Ops>']);
+  assert.strictEqual(await page.locator('#mnames ops').count(), 0);
+  await page.press('#cvi', 'ArrowDown');
+  await page.press('#cvi', 'Enter');
+  assert.strictEqual(await page.inputValue('#cvi'), '@Sam <Ops> ');
+
+  await page.fill('#cvi', 'hello @sa, later');
+  await page.locator('#cvi').evaluate((el) => {
+    el.setSelectionRange(9, 9);
+    el.dispatchEvent(new Event('input', { bubbles: true }));
+  });
+  await page.waitForSelector('#mnames.on button', { timeout: 5000 });
+  await page.press('#cvi', 'Tab');
+  assert.strictEqual(await page.inputValue('#cvi'), 'hello @Sanne, later');
+
+  await page.fill('#cvi', '@r');
+  await page.waitForSelector('#mnames.on button', { timeout: 5000 });
+  assert.strictEqual(await page.locator('#mnames button').first().textContent(), '@R&D "QA"');
+  await shot('mentions');
+  await page.fill('#cvi', '');
   await page.click('#cvback'); await sleep(300);
 
   // 3. Contacts tab
diff --git a/src/MyMesh.cpp b/src/MyMesh.cpp
index 1dbec1d2..8f482cca 100644
--- a/src/MyMesh.cpp
+++ b/src/MyMesh.cpp
@@ -2627,6 +2627,48 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
       _serial->writeFrameToAll(out_frame, 1 + PUB_KEY_SIZE);
     }
   }
+  // Add the accepted named advert to the session-local recent-heard cache.
+  // A monotonic sequence, not the remote advert timestamp or local RTC, defines
+  // order so an unset/adjusted clock cannot make a fresh node look stale.
+  if (path_len <= sizeof(AdvertPath::path) && (path_len == 0 || path)) {
+    const uint32_t recv_timestamp = getRTCClock()->getCurrentTime();
+#if defined(ESP32)
+    portENTER_CRITICAL(&advert_paths_mux);
+#endif
+    int found = -1, free_slot = -1, oldest_slot = 0;
+    uint32_t oldest_seq = UINT32_MAX;
+    for (int i = 0; i < ADVERT_PATH_TABLE_SIZE; i++) {
+      if (advert_paths[i].used &&
+          memcmp(advert_paths[i].pubkey_prefix, contact.id.pub_key,
+                 sizeof(AdvertPath::pubkey_prefix)) == 0) {
+        found = i;
+        break;
+      }
+      if (!advert_paths[i].used && free_slot < 0) free_slot = i;
+      if (advert_paths[i].used && advert_paths[i].recv_seq < oldest_seq) {
+        oldest_seq = advert_paths[i].recv_seq;
+        oldest_slot = i;
+      }
+    }
+    AdvertPath* p = &advert_paths[found >= 0 ? found : (free_slot >= 0 ? free_slot : oldest_slot)];
+    memcpy(p->pubkey_prefix, contact.id.pub_key, sizeof(p->pubkey_prefix));
+    // contact.name is from an over-the-air advert and may fill its 32-byte field
+    // with no NUL terminator; an unbounded strcpy would then run past p->name and
+    // corrupt the advert_paths table (garbled "Found"/recently-heard entries).
+    strncpy(p->name, contact.name, sizeof(p->name) - 1);
+    p->name[sizeof(p->name) - 1] = '\0';
+    p->recv_timestamp = recv_timestamp;
+    if (++advert_recv_seq == 0) ++advert_recv_seq;
+    p->recv_seq = advert_recv_seq;
+    p->type = contact.type;
+    p->used = true;
+    p->path_len = path_len;
+    if (path_len) memcpy(p->path, path, path_len);
+#if defined(ESP32)
+    portEXIT_CRITICAL(&advert_paths_mux);
+#endif
+  }
+
 #ifdef DISPLAY_CLASS
   // Notify the touch UI whether or not a companion app is connected. This used to
   // fire only in the standalone (else) branch, so a contact discovered while the
@@ -2641,46 +2683,39 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
   if (_ui) _ui->discoveredContact(contact, is_new, path_len);
 #endif
 
-  // add inbound-path to mem cache
-  if (path && path_len <= sizeof(AdvertPath::path)) {  // check path is valid
-    AdvertPath* p = advert_paths;
-    uint32_t oldest = 0xFFFFFFFF;
-    for (int i = 0; i < ADVERT_PATH_TABLE_SIZE; i++) {   // check if already in table, otherwise evict oldest
-      if (memcmp(advert_paths[i].pubkey_prefix, contact.id.pub_key, sizeof(AdvertPath::pubkey_prefix)) == 0) {
-        p = &advert_paths[i];   // found
-        break;
-      }
-      if (advert_paths[i].recv_timestamp < oldest) {
-        oldest = advert_paths[i].recv_timestamp;
-        p = &advert_paths[i];
-      }
-    }
-
-    memcpy(p->pubkey_prefix, contact.id.pub_key, sizeof(p->pubkey_prefix));
-    // contact.name is from an over-the-air advert and may fill its 32-byte field
-    // with no NUL terminator; an unbounded strcpy would then run past p->name and
-    // corrupt the advert_paths table (garbled "Found"/recently-heard entries).
-    strncpy(p->name, contact.name, sizeof(p->name) - 1);
-    p->name[sizeof(p->name) - 1] = '\0';
-    p->recv_timestamp = getRTCClock()->getCurrentTime();
-    p->path_len = path_len;
-    memcpy(p->path, path, p->path_len);
-  }
-
   if (!is_new) dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY); // only schedule lazy write for contacts that are in contacts[]
 }
 
 static int sort_by_recent(const void *a, const void *b) {
-  return ((AdvertPath *) b)->recv_timestamp - ((AdvertPath *) a)->recv_timestamp;
+  const RecentlyHeardName* x = static_cast<const RecentlyHeardName*>(a);
+  const RecentlyHeardName* y = static_cast<const RecentlyHeardName*>(b);
+  if (x->recv_seq == y->recv_seq) return memcmp(x->pubkey_prefix, y->pubkey_prefix, sizeof(x->pubkey_prefix));
+  return (int32_t)(x->recv_seq - y->recv_seq) > 0 ? -1 : 1;
 }
 
-int MyMesh::getRecentlyHeard(AdvertPath dest[], int max_num) {
-  if (max_num > ADVERT_PATH_TABLE_SIZE) max_num = ADVERT_PATH_TABLE_SIZE;
-  qsort(advert_paths, ADVERT_PATH_TABLE_SIZE, sizeof(advert_paths[0]), sort_by_recent);
-
-  for (int i = 0; i < max_num; i++) {
-    dest[i] = advert_paths[i];
+int MyMesh::getRecentlyHeard(RecentlyHeardName dest[], int max_num) {
+  if (!dest || max_num <= 0) return 0;
+  RecentlyHeardName snapshot[ADVERT_PATH_TABLE_SIZE];
+  int count = 0;
+#if defined(ESP32)
+  portENTER_CRITICAL(&advert_paths_mux);
+#endif
+  for (int i = 0; i < ADVERT_PATH_TABLE_SIZE; i++) {
+    const AdvertPath& p = advert_paths[i];
+    if (!p.used || !p.name[0]) continue;
+    RecentlyHeardName& out = snapshot[count++];
+    memcpy(out.pubkey_prefix, p.pubkey_prefix, sizeof(out.pubkey_prefix));
+    memcpy(out.name, p.name, sizeof(out.name));
+    out.name[sizeof(out.name) - 1] = '\0';
+    out.recv_seq = p.recv_seq;
+    out.type = p.type;
   }
+#if defined(ESP32)
+  portEXIT_CRITICAL(&advert_paths_mux);
+#endif
+  qsort(snapshot, count, sizeof(snapshot[0]), sort_by_recent);
+  if (max_num > count) max_num = count;
+  memcpy(dest, snapshot, (size_t)max_num * sizeof(dest[0]));
   return max_num;
 }
 
@@ -4880,20 +4915,28 @@ void MyMesh::handleCmdFrame(size_t len) {
   } else if (cmd_frame[0] == CMD_GET_ADVERT_PATH && len >= PUB_KEY_SIZE+2) {
     // FUTURE use:  uint8_t reserved = cmd_frame[1];
     uint8_t *pub_key = &cmd_frame[2];
-    AdvertPath* found = NULL;
+    AdvertPath found = {};
+    bool has_found = false;
+#if defined(ESP32)
+    portENTER_CRITICAL(&advert_paths_mux);
+#endif
     for (int i = 0; i < ADVERT_PATH_TABLE_SIZE; i++) {
-      auto p = &advert_paths[i];
-      if (memcmp(p->pubkey_prefix, pub_key, sizeof(p->pubkey_prefix)) == 0) {
+      const AdvertPath& p = advert_paths[i];
+      if (p.used && memcmp(p.pubkey_prefix, pub_key, sizeof(p.pubkey_prefix)) == 0) {
         found = p;
+        has_found = true;
         break;
       }
     }
-    if (found) {
+#if defined(ESP32)
+    portEXIT_CRITICAL(&advert_paths_mux);
+#endif
+    if (has_found) {
       out_frame[0] = RESP_CODE_ADVERT_PATH;
-      memcpy(&out_frame[1], &found->recv_timestamp, 4);
-      out_frame[5] = found->path_len;
-      memcpy(&out_frame[6], found->path, found->path_len);
-      _serial->writeFrame(out_frame, 6 + found->path_len);
+      memcpy(&out_frame[1], &found.recv_timestamp, 4);
+      out_frame[5] = found.path_len;
+      memcpy(&out_frame[6], found.path, found.path_len);
+      _serial->writeFrame(out_frame, 6 + found.path_len);
     } else {
       writeErrFrame(ERR_CODE_NOT_FOUND);
     }
diff --git a/src/MyMesh.h b/src/MyMesh.h
index a9434a94..4fb8a513 100644
--- a/src/MyMesh.h
+++ b/src/MyMesh.h
@@ -121,9 +121,19 @@ struct AdvertPath {
   uint8_t path_len;
   char    name[32];
   uint32_t recv_timestamp;
+  uint32_t recv_seq;
+  uint8_t type;
+  bool used;
   uint8_t path[MAX_PATH_SIZE];
 };
 
+struct RecentlyHeardName {
+  uint8_t pubkey_prefix[7];
+  char name[32];
+  uint32_t recv_seq;
+  uint8_t type;
+};
+
 class MyMesh : public BaseChatMesh, public DataStoreHost {
 public:
   MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables, DataStore& store, AbstractUITask* ui=NULL);
@@ -226,7 +236,10 @@ public:
   bool sendAdvert(bool flood);
   void enterCLIRescue();
 
-  int  getRecentlyHeard(AdvertPath dest[], int max_num);
+  int  getRecentlyHeard(RecentlyHeardName dest[], int max_num);
+  bool uiIsMeshcomodRecipient(const uint8_t* pub_key_prefix_6) const {
+    return isMeshcomodRecipient(pub_key_prefix_6);
+  }
 
   // On-device terminal: register an output sink (nullptr = off) and run a local
   // CLI command. Replies flow through pushMeshcomodReply -> the sink.
@@ -1397,6 +1410,10 @@ private:
 
   #define ADVERT_PATH_TABLE_SIZE   16
   AdvertPath advert_paths[ADVERT_PATH_TABLE_SIZE]; // circular table
+  uint32_t advert_recv_seq = 0;
+#if defined(ESP32)
+  portMUX_TYPE advert_paths_mux = portMUX_INITIALIZER_UNLOCKED;
+#endif
 
   // Client-side retry-until-echo state. Only one exact packet clone is retained
   // in the outbound queue per active slot, matching the companion behavior.
diff --git a/src/helpers/esp32/WebSocketCompanionServer.cpp b/src/helpers/esp32/WebSocketCompanionServer.cpp
index afbaf348..962eb96f 100644
--- a/src/helpers/esp32/WebSocketCompanionServer.cpp
+++ b/src/helpers/esp32/WebSocketCompanionServer.cpp
@@ -171,10 +171,13 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   ".b.in{align-self:flex-start;background:#17181b}.b.out{align-self:flex-end;background:#123f3a}\n"
   ".bname{font-size:11px;color:#19d6c2;margin-bottom:2px}.btext{white-space:pre-wrap}\n"
   ".bmeta{font-size:10px;color:#8a9095;text-align:right;margin-top:2px}\n"
-  ".cb{display:flex;border-top:1px solid #1c1c1f;padding:8px;gap:8px}\n"
-  ".cb input{flex:1;background:#111214;color:#e8e8ea;border:1px solid #2a2a2e;border-radius:18px;padding:9px 14px;font:inherit;outline:none}\n"
+  ".cb{display:flex;border-top:1px solid #1c1c1f;padding:8px;gap:8px;position:relative}.cwrap{position:relative;flex:1;min-width:0}\n"
+  ".cb input{width:100%;background:#111214;color:#e8e8ea;border:1px solid #2a2a2e;border-radius:18px;padding:9px 14px;font:inherit;outline:none}\n"
   ".cb input:focus{border-color:#19d6c2}\n"
   ".cb button{background:#19d6c2;color:#04201d;border:none;border-radius:18px;padding:0 16px;font-weight:700;cursor:pointer}\n"
+  "#mnames{display:none;position:absolute;left:0;right:0;bottom:calc(100% + 6px);z-index:12;background:#151619;border:1px solid #2a2a2e;border-radius:8px;box-shadow:0 5px 18px rgba(0,0,0,.5);overflow:hidden}\n"
+  "#mnames.on{display:block}#mnames button{display:block;width:100%;border:0;border-bottom:1px solid #202225;border-radius:0;background:#151619;color:#d7dbdd;text-align:left;padding:9px 13px;font:inherit;cursor:pointer}\n"
+  "#mnames button:last-child{border-bottom:0}#mnames button.on{background:#17342f;color:#19d6c2}\n"
   "#o{flex:1;overflow-y:auto;padding:10px 12px;white-space:pre-wrap;word-break:break-word;line-height:1.4;font-family:'JetBrains Mono',Menlo,monospace;font-size:13px}\n"
   "#tbar{display:flex;border-top:1px solid #1c1c1f;padding:8px 10px;gap:8px;align-items:center}\n"
   "#p{color:#19d6c2;font-weight:700}\n"
@@ -221,7 +224,7 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   " <div id=cview style=display:none>\n"
   "  <div id=cvh><button id=cvback>&lsaquo;</button><span id=cvname></span></div>\n"
   "  <div id=cvmsgs></div>\n"
-  "  <div class=cb><input id=cvi placeholder='Message' autocomplete=off><button id=cvsend>Send</button></div>\n"
+  "  <div class=cb><div class=cwrap><input id=cvi maxlength=160 placeholder='Message' autocomplete=off><div id=mnames></div></div><button id=cvsend>Send</button></div>\n"
   " </div>\n"
   "</div>\n"
   "<div id=pcontacts class=pane style=display:none>\n"
@@ -239,6 +242,7 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   "<div id=toast></div>\n"
   "<script>\n"
   "var WS,dec=new TextDecoder(),curTab='chats',chat=null,threads=[],contacts=[],channels=[];\n"
+  "var mentionNames=[],mentionMatches=[],mentionSel=0,mentionReq=0;\n"
   "var csort=0,cfilter=0,csearchq='',self={la:0,lo:0},lpAt=0,useMi=0,discCount=0;\n"
   "var SORTL=['Recent','A-Z','Distance'],FILTL=['All','Repeaters','Peers','Favorites','Located','Direct'];\n"
   "function age(ts){if(!ts||ts<1000000000)return'';var s=Math.floor(Date.now()/1000)-ts;if(s<0)s=0;if(s<60)return'now';if(s<3600)return Math.floor(s/60)+'m';if(s<86400)return Math.floor(s/3600)+'h';if(s<604800)return Math.floor(s/86400)+'d';return Math.floor(s/604800)+'w'}\n"
@@ -251,6 +255,16 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   "function stat(t,k){var el=E('dot');el.style.color=(k=='ok')?'#19d6c2':((k=='err')?'#ff6b6b':'#63696e');el.title=t}\n"
   "function wsSend(s){if(WS&&WS.readyState==1){WS.send(s);return true}return false}\n"
   "function cById(i){for(var k=0;k<contacts.length;k++)if(contacts[k].i==i)return contacts[k];return null}\n"
+  "function mentionHide(){mentionMatches=[];mentionSel=0;var b=E('mnames');b.classList.remove('on');b.innerHTML=''}\n"
+  "function mentionToken(){var i=E('cvi'),v=i.value,p=i.selectionStart;if(p==null)return null;var a=p,found=false,punc=',.;:!?()[]{}<>';\n"
+  " while(a>0){var c=v.charAt(a-1);if(c=='@'){a--;found=true;break}if(' \\n\\t\\r'.indexOf(c)>=0||punc.indexOf(c)>=0)return null;a--}\n"
+  " if(!found||(a>0&&' \\n\\t\\r'.indexOf(v.charAt(a-1))<0))return null;var end=p;while(end<v.length&&' \\n\\t\\r'.indexOf(v.charAt(end))<0&&punc.indexOf(v.charAt(end))<0)end++;return{a:a,p:p,e:end,q:v.slice(a+1,p)}}\n"
+  "function mentionPaint(){var b=E('mnames');b.innerHTML='';if(!mentionMatches.length){mentionHide();return}\n"
+  " mentionMatches.forEach(function(n,idx){var x=document.createElement('button');x.type='button';x.textContent='@'+n;if(idx==mentionSel)x.className='on';x.onmousedown=function(e){e.preventDefault()};x.onclick=function(){mentionPick(n)};b.appendChild(x)});b.classList.add('on')}\n"
+  "function mentionRefresh(){var t=mentionToken();if(!t){mentionHide();return}var q=t.q.toLowerCase();mentionMatches=mentionNames.filter(function(n){return n.toLowerCase().indexOf(q)==0}).slice(0,6);if(mentionSel>=mentionMatches.length)mentionSel=0;mentionPaint()}\n"
+  "function mentionPick(n){var i=E('cvi'),t=mentionToken();if(!t)return mentionHide();var v=i.value,sp=t.e==v.length?' ':'';i.value=v.slice(0,t.a)+'@'+n+sp+v.slice(t.e);var p=t.a+1+n.length+sp.length;mentionHide();i.focus();i.setSelectionRange(p,p)}\n"
+  "function mentionMove(d){if(!mentionMatches.length)return;mentionSel=(mentionSel+d+mentionMatches.length)%mentionMatches.length;mentionPaint()}\n"
+  "function mentionRequest(){if(!chat)return;mentionReq++;wsSend('@mh '+mentionReq)}\n"
   "function showTab(t){curTab=t;['chats','contacts','term'].forEach(function(x){E('p'+x).style.display=(x==t)?'':'none'});\n"
   " each(document.querySelectorAll('#tabs button'),function(b){b.className=(b.getAttribute('data-t')==t)?'on':''});\n"
   " if(t=='chats'){if(!chat){closeChat();wsSend('@t')}}else if(t=='contacts'){wsSend('@c')}else if(t=='term'){E('i').focus()}}\n"
@@ -324,12 +338,13 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   "function onData(s){var d;try{d=JSON.parse(s)}catch(_){return}\n"
   " if(d.t=='t'){onThreads(d.threads||[])}\n"
   " else if(d.t=='c'){contacts=d.contacts||[];channels=d.channels||[];discCount=d.dc||0;renderContacts()}\n"
+  " else if(d.t=='mh'){if(+d.q==mentionReq){mentionNames=d.names||[];mentionRefresh()}}\n"
   " else if(d.t=='m'){openChatView(d)}\n"
   " else if(d.t=='st'){renderStatus(d)}\n"
   " else if(d.t=='ci'){showContactInfo(d)}\n"
   " else if(d.t=='dc'){showDiscovered(d.nodes||[])}\n"
   " else if(d.t=='sg'){showSettings(d)}\n"
-  " else if(d.t=='rx'){wsSend('@t');if(chat&&chat.i>=0)wsSend('@m '+chat.i);if(curTab=='contacts')wsSend('@c')}}\n"
+  " else if(d.t=='rx'){wsSend('@t');if(chat&&chat.i>=0)wsSend('@m '+chat.i);if(chat)mentionRequest();if(curTab=='contacts')wsSend('@c')}}\n"
   "function renderThreads(){var h='';if(!threads.length)h='<div class=empty>No chats yet.<br>Start one from Contacts.</div>';\n"
   " threads.sort(function(a,b){return (b.ts||0)-(a.ts||0)});\n"
   " threads.forEach(function(t){var bd=t.u>0?'<span class=badge>'+t.u+'</span>':'';\n"
@@ -386,12 +401,12 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   "  var nm=(!m.o&&chat.ch)?'<div class=bname>'+esc(m.s)+'</div>':'';\n"
   "  h+='<div class=\"'+cls+'\" data-mi='+i+'>'+nm+'<div class=btext>'+esc(m.x)+'</div><div class=bmeta>'+meta+'</div></div>'});\n"
   " E('cvmsgs').innerHTML=h;if(!same||wasBottom)E('cvmsgs').scrollTop=E('cvmsgs').scrollHeight;\n"
-  " each(E('cvmsgs').querySelectorAll('.b'),function(b){var m=arr[+b.getAttribute('data-mi')];longPress(b,function(){if(m)msgSheet(m)})})}\n"
-  "function closeChat(){chat=null;E('cview').style.display='none';E('tlist').style.display=''}\n"
-  "function chatSend(){var v=E('cvi').value.trim();if(!v||!chat)return;E('cvi').value='';\n"
+  " each(E('cvmsgs').querySelectorAll('.b'),function(b){var m=arr[+b.getAttribute('data-mi')];longPress(b,function(){if(m)msgSheet(m)})});if(!same)mentionRequest()}\n"
+  "function closeChat(){mentionHide();chat=null;E('cview').style.display='none';E('tlist').style.display=''}\n"
+  "function chatSend(){mentionHide();var v=E('cvi').value.trim();if(!v||!chat)return;E('cvi').value='';\n"
   " if(chat.i>=0)wsSend('@s '+chat.i+' '+v);else if(chat.c!=null)wsSend('@sc '+chat.c+' '+v);else if(chat.h!=null)wsSend('@sh '+chat.h+' '+v)}\n"
   "function conn(){WS=new WebSocket((location.protocol=='https:'?'wss://':'ws://')+location.host+'/term');WS.binaryType='arraybuffer';\n"
-  " WS.onopen=function(){stat('online','ok');wsSend('@st');if(curTab=='chats')wsSend('@t')};\n"
+  " WS.onopen=function(){stat('online','ok');wsSend('@st');if(curTab=='chats')wsSend('@t');if(chat)mentionRequest()};\n"
   " WS.onclose=function(){stat('reconnecting...','err');setTimeout(conn,1500)};WS.onerror=function(){stat('error','err')};\n"
   " WS.onmessage=function(e){var b=new Uint8Array(e.data);if(!b.length)return;var ty=b[0],p=dec.decode(b.subarray(1));if(ty==0)tadd(p);else if(ty==1)onData(p)}}\n"
   "each(document.querySelectorAll('#tabs button'),function(b){b.onclick=function(){showTab(b.getAttribute('data-t'))}});\n"
@@ -400,7 +415,9 @@ static const char WS_HTML_TERMINAL_PAGE[] =
   "E('cfilt').onclick=function(){sheet('Filter',FILTL.map(function(f,i){return {label:(i==cfilter?'\\u2713 ':'')+f,fn:function(){cfilter=i;renderContacts()}}}))};\n"
   "E('csearch').addEventListener('input',function(){csearchq=E('csearch').value.trim().toLowerCase();renderContacts()});\n"
   "E('cvback').onclick=function(){closeChat();wsSend('@t')};E('cvsend').onclick=chatSend;\n"
-  "E('cvi').addEventListener('keydown',function(e){if(e.key=='Enter'){chatSend();e.preventDefault()}});\n"
+  "E('cvi').addEventListener('input',mentionRefresh);E('cvi').addEventListener('click',mentionRefresh);\n"
+  "E('cvi').addEventListener('blur',function(){setTimeout(mentionHide,120)});\n"
+  "E('cvi').addEventListener('keydown',function(e){if(mentionMatches.length){if(e.key=='ArrowDown'){mentionMove(1);e.preventDefault();return}if(e.key=='ArrowUp'){mentionMove(-1);e.preventDefault();return}if(e.key=='Enter'||e.key=='Tab'){mentionPick(mentionMatches[mentionSel]);e.preventDefault();return}if(e.key=='Escape'){mentionHide();e.preventDefault();return}}if(e.key=='Enter'){chatSend();e.preventDefault()}});\n"
   "E('i').addEventListener('keydown',function(e){if(e.key=='Enter'){tsend();e.preventDefault()}\n"
   " else if(e.key=='ArrowUp'){if(hi>0){hi--;E('i').value=hist[hi];e.preventDefault()}}\n"
   " else if(e.key=='ArrowDown'){if(hi<hist.length-1){hi++;E('i').value=hist[hi]}else{hi=hist.length;E('i').value=''}e.preventDefault()}\n"
diff --git a/src/ui-touch/UITask.cpp b/src/ui-touch/UITask.cpp
index 88abf3d8..dcdfcd95 100644
--- a/src/ui-touch/UITask.cpp
+++ b/src/ui-touch/UITask.cpp
@@ -3979,6 +3979,10 @@ static char      s_altacc_key    = 0;         // letter driving the open picker
 static lv_obj_t* s_altacc_ta     = nullptr;   // field the pick inserts into
 static bool tanAltAccentHandleKey(char c, lv_obj_t* ta);
 static void tanAltAccentAltReleased();
+static bool mentionNavActive();
+static void mentionNavMove(int delta);
+static void mentionNavConfirm();
+static void mentionBoxHide();
 // The UP/DOWN/LEFT/RIGHT action, factored out so a HELD arrow can auto-repeat it (navPump's
 // per-frame tick re-fires this). Recomputes the focused field each call so repeat stays correct.
 static void navArrowAction(uint32_t key) {
@@ -4093,6 +4097,36 @@ static void navPump() {
     // Hard screen lock: the overlay absorbs everything else (Vol- was already handled above).
     if (g_lv.task && g_lv.task->isManualLocked()) continue;
 #endif
+    // Mention rows are intentionally outside the LVGL focus group. Route the
+    // Tanmatsu's dedicated navigation events into their private selection state
+    // before ordinary field/caret navigation sees them. Printable keyboard input
+    // still falls through and narrows the list.
+    if (mentionNavActive()) {
+      if (ev.type == INPUT_EVENT_TYPE_NAVIGATION) {
+        const bool down = ev.args_navigation.state;
+        switch (ev.args_navigation.key) {
+          case BSP_INPUT_NAVIGATION_KEY_UP:    if (down) mentionNavMove(-1); continue;
+          case BSP_INPUT_NAVIGATION_KEY_DOWN:  if (down) mentionNavMove(+1); continue;
+          case BSP_INPUT_NAVIGATION_KEY_RETURN:
+          case BSP_INPUT_NAVIGATION_KEY_GAMEPAD_A:
+          case BSP_INPUT_NAVIGATION_KEY_JOYSTICK_PRESS:
+            if (down) mentionNavConfirm(); continue;
+          case BSP_INPUT_NAVIGATION_KEY_F1:
+          case BSP_INPUT_NAVIGATION_KEY_ESC:
+          case BSP_INPUT_NAVIGATION_KEY_GAMEPAD_B:
+            if (down) mentionBoxHide(); continue;
+          case BSP_INPUT_NAVIGATION_KEY_LEFT:
+          case BSP_INPUT_NAVIGATION_KEY_RIGHT:
+            if (down) mentionBoxHide();
+            break;   // dismiss, then let normal caret navigation handle it
+          default: break;
+        }
+      } else if (ev.type == INPUT_EVENT_TYPE_KEYBOARD) {
+        const char c = ev.args_keyboard.ascii;
+        if (c == '\r' || c == '\n') { mentionNavConfirm(); continue; }
+        if (c == 8 || c == 127)      { mentionBoxHide(); continue; }
+      }
+    }
     // An open dropdown captures input: arrows move the highlight (LV_KEY_UP/DOWN, NOT prev/next),
     // Enter selects + closes, Esc/✕ closes. navMaybeRebuild() leaves the group alone while it's open.
     if (navOpenDropdown()) {
@@ -6699,37 +6733,34 @@ static void accentBoxMaybeShow() {
 }
 
 // ---- @-mention contact picker (issue #42) --------------------------------
-// Typing "@name" in a chat composer pops a touch list of matching contacts —
-// modeled on the accent box: a passive overlay (NAV_SKIP_FLAG) that never steals
-// keyboard-nav focus and, for now, is selected by TOUCH only. Tapping a row
-// replaces the "@partial" with "@FullName ".
+// Typing "@name" in a chat composer pops a list of matching recently-heard
+// chat identities. It is modeled on the accent box: a passive overlay
+// (NAV_SKIP_FLAG) that never steals keyboard-nav focus. Touch or the board's
+// hardware selector replaces the active token with the chosen full name.
 static lv_obj_t* s_mentionbox    = nullptr;
 static lv_obj_t* s_mentionbox_ta = nullptr;
 static constexpr int k_mention_max = 6;
+static constexpr int k_mention_source_max = 16;
 static char s_mention_names[k_mention_max][32];   // kept alive for the cell callbacks
-#if defined(TLORA_PAGER)
-// No touch on this board, and the cells below are NAV_SKIP_FLAG (excluded from
-// the normal keyboard/encoder focus group by design, since touch boards pick
-// them by tap) -- without this, the box is completely unreachable here.
-// Unlike the accent box (armed explicitly via Fn+Space), this list grabs the
-// encoder the INSTANT it's shown (mentionBoxMaybeShow() sets
-// s_mentionnav_active=true directly) -- see that function for why. The rotary
-// encoder walks s_mentionbox_cells (updatePagerEncoder()); Enter (the
-// encoder's own click) confirms via mentionNavConfirm(); Backspace cancels.
+#if CAP_KEYPAD_NAV
+// The rows stay outside the normal focus group so rebuilding this per keystroke
+// never steals focus from the composer. Each board routes its selector into
+// this private state: trackball, Pager encoder, M9 d-pad, or Tanmatsu arrows.
 static lv_obj_t* s_mentionbox_cells[k_mention_max];
 static uint8_t   s_mentionbox_cell_n  = 0;
 static bool      s_mentionnav_active  = false;
 static int       s_mentionnav_idx     = 0;
+static bool mentionNavActive() { return s_mentionnav_active; }
 #endif
 static void mentionBoxHide() {
   if (s_mentionbox) { lv_obj_del(s_mentionbox); s_mentionbox = nullptr; }
   s_mentionbox_ta = nullptr;
-#if defined(TLORA_PAGER)
+#if CAP_KEYPAD_NAV
   s_mentionnav_active = false;
   s_mentionbox_cell_n = 0;
 #endif
 }
-#if defined(TLORA_PAGER)
+#if CAP_KEYPAD_NAV
 static void mentionNavRestyle() {
   for (uint8_t i = 0; i < s_mentionbox_cell_n; ++i) {
     if (!s_mentionbox_cells[i]) continue;
@@ -6737,6 +6768,12 @@ static void mentionNavRestyle() {
       lv_color_hex((int)i == s_mentionnav_idx ? COLOR_ACCENT : 0x1B2B3A), LV_PART_MAIN);
   }
 }
+static void mentionNavMove(int delta) {
+  if (!s_mentionnav_active || s_mentionbox_cell_n == 0 || delta == 0) return;
+  while (delta > 0) { s_mentionnav_idx = (s_mentionnav_idx + 1) % (int)s_mentionbox_cell_n; --delta; }
+  while (delta < 0) { s_mentionnav_idx = (s_mentionnav_idx - 1 + (int)s_mentionbox_cell_n) % (int)s_mentionbox_cell_n; ++delta; }
+  mentionNavRestyle();
+}
 // Encoder's short-click while picking: fire the highlighted cell's own CLICKED
 // binding (mentionBoxCellCb, below) rather than duplicating its delete-partial
 // + insert-name + mentionBoxHide() logic.
@@ -6748,20 +6785,75 @@ static void mentionNavConfirm() {
   }
 }
 #endif
-// Index of the active mention's '@' in `text`, or -1. The active mention is the
-// last '@' that begins a word (start of text or after whitespace) with no
-// whitespace between it and the end (where the caret is).
-static int mentionAtPos(const char* text) {
-  if (!text) return -1;
-  for (int i = (int)strlen(text) - 1; i >= 0; --i) {
-    const char c = text[i];
-    if (c == ' ' || c == '\n' || c == '\t') return -1;     // a space before any '@' -> not in a mention
-    if (c == '@') {
-      const bool at_word_start = (i == 0) || text[i-1] == ' ' || text[i-1] == '\n' || text[i-1] == '\t';
-      return at_word_start ? i : -1;                       // '@' mid-word (e.g. an email) isn't a mention
+static uint32_t taCpToByte(const char* txt, uint32_t cp_target);
+static uint32_t taByteToCp(const char* txt, uint32_t byte_target);
+
+static int collectRecentMentionNames(char out[][32], int max_num) {
+  if (!out || max_num <= 0) return 0;
+  RecentlyHeardName heard[k_mention_source_max];
+  const int heard_n = the_mesh.getRecentlyHeard(heard, k_mention_source_max);
+  const uint8_t* self = the_mesh.getSelfPubKey();
+  int count = 0;
+  for (int i = 0; i < heard_n && count < max_num; ++i) {
+    if (heard[i].type != ADV_TYPE_CHAT || !heard[i].name[0]) continue;
+    if (self && memcmp(heard[i].pubkey_prefix, self, sizeof(heard[i].pubkey_prefix)) == 0) continue;
+    if (the_mesh.uiIsMeshcomodRecipient(heard[i].pubkey_prefix)) continue;
+    if (touchPrefsIsIgnored(heard[i].pubkey_prefix)) continue;
+    bool duplicate = false;
+    for (int j = 0; j < count; ++j) {
+      if (strcasecmp(out[j], heard[i].name) == 0) { duplicate = true; break; }
     }
+    if (duplicate) continue;
+    strlcpy(out[count++], heard[i].name, 32);
   }
-  return -1;
+  return count;
+}
+
+static bool mentionWhitespace(unsigned char c) {
+  return c == ' ' || c == '\n' || c == '\t' || c == '\r';
+}
+static bool mentionPunctuation(unsigned char c) {
+  switch (c) {
+    case ',': case '.': case ';': case ':': case '!': case '?':
+    case '(': case ')': case '[': case ']': case '{': case '}':
+    case '<': case '>':
+      return true;
+    default:
+      return false;
+  }
+}
+
+struct MentionToken {
+  size_t at;
+  size_t caret;
+  size_t end;
+};
+
+// Locate the active @token around the actual caret. The start must be at text
+// start or after whitespace, so an email address never opens the picker.
+static bool mentionTokenAtCaret(lv_obj_t* ta, MentionToken& token) {
+  if (!ta) return false;
+  const char* text = lv_textarea_get_text(ta);
+  if (!text) return false;
+  const size_t len = strlen(text);
+  size_t caret = taCpToByte(text, lv_textarea_get_cursor_pos(ta));
+  if (caret > len) caret = len;
+
+  size_t at = caret;
+  bool found = false;
+  while (at > 0) {
+    const unsigned char c = (unsigned char)text[at - 1];
+    if (c == '@') { --at; found = true; break; }
+    if (mentionWhitespace(c) || mentionPunctuation(c)) return false;
+    --at;
+  }
+  if (!found || (at > 0 && !mentionWhitespace((unsigned char)text[at - 1]))) return false;
+
+  size_t end = caret;
+  while (end < len && !mentionWhitespace((unsigned char)text[end]) &&
+         !mentionPunctuation((unsigned char)text[end])) ++end;
+  token = { at, caret, end };
+  return true;
 }
 static void mentionBoxCellCb(lv_event_t* e) {
   if (lv_event_get_code(e) != LV_EVENT_CLICKED) return;
@@ -6769,48 +6861,62 @@ static void mentionBoxCellCb(lv_event_t* e) {
   lv_obj_t* ta = s_mentionbox_ta;
   if (ta && name && name[0]) {
     const char* text = lv_textarea_get_text(ta);
-    const int at = mentionAtPos(text);
-    if (at >= 0) {
-      char out[300];
-      snprintf(out, sizeof out, "%.*s@%s ", at, text, name);   // keep text before '@', then "@Name "
-      lv_textarea_set_text(ta, out);
-      if (ta == s_kb_mirror_ta) kbMirrorSyncToReal();
+    MentionToken token{};
+    if (text && mentionTokenAtCaret(ta, token)) {
+      char out[UITask::MAX_MSG_TEXT + 1];
+      const size_t name_len = strlen(name);
+      const size_t suffix_len = strlen(text + token.end);
+      const bool add_space = text[token.end] == '\0';
+      const size_t needed = token.at + 1 + name_len + (add_space ? 1 : 0) + suffix_len;
+      if (needed <= UITask::MAX_MSG_TEXT) {
+        size_t pos = 0;
+        memcpy(out + pos, text, token.at); pos += token.at;
+        out[pos++] = '@';
+        memcpy(out + pos, name, name_len); pos += name_len;
+        if (add_space) out[pos++] = ' ';
+        const size_t caret_byte = pos;
+        memcpy(out + pos, text + token.end, suffix_len + 1);
+
+        mentionBoxHide();   // setting text emits VALUE_CHANGED; tear down first
+        if (ta == s_kb_mirror_ta) {
+          lv_textarea_set_text(ta, out);
+          lv_textarea_set_cursor_pos(ta, (int32_t)taByteToCp(out, caret_byte));
+          kbMirrorSyncToReal();
+          if (s_kb_bind_ta)
+            lv_textarea_set_cursor_pos(s_kb_bind_ta, (int32_t)taByteToCp(out, caret_byte));
+        } else {
+          setTextareaSynced(ta, out);
+          lv_textarea_set_cursor_pos(ta, (int32_t)taByteToCp(out, caret_byte));
+          if (s_kb_bind_ta == ta && s_kb_mirror_ta)
+            lv_textarea_set_cursor_pos(s_kb_mirror_ta, (int32_t)taByteToCp(out, caret_byte));
+        }
+        return;
+      }
     }
   }
   mentionBoxHide();
 }
-// Show the contact picker when the composer ends in "@partial". Returns true
+// Show the recent-name picker for the @token at the caret. Returns true
 // when a picker is shown (so the caller suppresses the accent box).
-static bool mentionBoxMaybeShow() {
+static bool mentionBoxMaybeShow(lv_obj_t* ta) {
   mentionBoxHide();
-#if defined(HAS_M9_KEYBOARD)
-  return false;   // suppressed like the accent box (see accentBoxMaybeShow): touch-only cells, no key path here
-#endif
-  if (!g_lv.keyboard) return false;
-  lv_obj_t* ta = lv_keyboard_get_textarea(g_lv.keyboard);
   if (!ta) return false;
   const char* text = lv_textarea_get_text(ta);
-  const int at = mentionAtPos(text);
-  if (at < 0) return false;
-  const char* partial = text + at + 1;
-  const size_t plen = strlen(partial);
+  MentionToken token{};
+  if (!text || !mentionTokenAtCaret(ta, token)) return false;
+  const char* partial = text + token.at + 1;
+  const size_t plen = token.caret - token.at - 1;
+  char recent[k_mention_source_max][32];
+  const int recent_n = collectRecentMentionNames(recent, k_mention_source_max);
   int n = 0;
-  const int total = the_mesh.getNumContacts();
-  for (int i = 0; i < total && n < k_mention_max; ++i) {
-    ContactInfo c;
-    if (!the_mesh.getContactByIdx(i, c) || !c.name[0]) continue;
-    if (plen > 0 && strncasecmp(c.name, partial, plen) != 0) continue;   // prefix match (case-insensitive)
-    strlcpy(s_mention_names[n], c.name, sizeof s_mention_names[n]);
+  for (int i = 0; i < recent_n && n < k_mention_max; ++i) {
+    if (plen > 0 && strncasecmp(recent[i], partial, plen) != 0) continue;
+    strlcpy(s_mention_names[n], recent[i], sizeof s_mention_names[n]);
     ++n;
   }
   if (n == 0) return false;
   s_mentionbox_ta = ta;
-#if defined(TLORA_PAGER)
-  // Unlike the accent box (armed explicitly via Fn+Space, since it pops up
-  // after almost every letter typed and must not steal focus from ongoing
-  // typing), the mention list only appears when the user has deliberately
-  // typed "@partial" looking for someone to pick -- so it grabs the encoder
-  // immediately, no arming gesture needed.
+#if CAP_KEYPAD_NAV
   s_mentionnav_active = true;
   s_mentionnav_idx = 0;
   s_mentionbox_cell_n = (uint8_t)n;
@@ -6836,7 +6942,7 @@ static bool mentionBoxMaybeShow() {
     lv_obj_set_style_bg_color(b, lv_color_hex(0x1B2B3A), LV_PART_MAIN);
     lv_obj_set_style_bg_color(b, lv_color_hex(COLOR_ACCENT), LV_PART_MAIN | LV_STATE_PRESSED);
     lv_obj_add_event_cb(b, mentionBoxCellCb, LV_EVENT_CLICKED, (void*)s_mention_names[i]);
-#if defined(TLORA_PAGER)
+  #if CAP_KEYPAD_NAV
     if (i < k_mention_max) s_mentionbox_cells[i] = b;
 #endif
     lv_obj_t* l = lv_label_create(b);
@@ -6848,8 +6954,8 @@ static bool mentionBoxMaybeShow() {
     lv_obj_center(l);
   }
   lv_obj_set_size(s_mentionbox, boxw + 8, n * rowh + (n - 1) * 3 + 8);
-#if defined(TLORA_PAGER)
-  mentionNavRestyle();   // highlight entry 0 immediately -- see the auto-arm note above
+#if CAP_KEYPAD_NAV
+  mentionNavRestyle();
 #endif
   // Place it above the composer, clamped above the keyboard (mirrors the accent box).
   lv_obj_update_layout(s_mentionbox);
@@ -6867,12 +6973,14 @@ static bool mentionBoxMaybeShow() {
   lv_obj_move_foreground(s_mentionbox);
   return true;
 }
-// One entry point for the composer's typing-time suggestion overlays: the
-// @-mention picker takes priority over the accent box (never both at once).
-static void composerSuggestRefresh() {
-  if (mentionBoxMaybeShow()) { accentBoxHide(); return; }
+static void composerMentionRefresh(lv_obj_t* ta) {
+  if (mentionBoxMaybeShow(ta)) { accentBoxHide(); return; }
   mentionBoxHide();
-  accentBoxMaybeShow();
+}
+static void composerSuggestChangedCb(lv_event_t* e) {
+  lv_obj_t* ta = lv_event_get_target(e);
+  if (kbMirrorActive() && s_kb_bind_ta == ta && s_kb_mirror_ta) ta = s_kb_mirror_ta;
+  composerMentionRefresh(ta);
 }
 
 static void keyboardCb(lv_event_t* e) {
@@ -6902,7 +7010,7 @@ static void keyboardCb(lv_event_t* e) {
   else if (code == LV_EVENT_VALUE_CHANGED) {
     kbSetRotateArrowsOpa(LV_OPA_20);
     accentHandleValueChanged();
-    composerSuggestRefresh();   // @mention contact picker, else the accent box
+    if (!s_mentionbox) accentBoxMaybeShow();
   }
 }
 
@@ -19274,7 +19382,7 @@ static void terminalSubmit() {
 #if !defined(HAS_TANMATSU)
 static char*          s_webdata_buf  = nullptr;
 static const size_t   WEBDATA_BUF    = 16000;
-static volatile bool  s_web_rx_nudge = false;   // set by onThreadsChanged (mesh ctx); the UI loop does the actual pushTermData (keeps it single-producer)
+static volatile bool  s_web_rx_nudge = false;   // set by mesh callbacks; the UI loop does the actual pushTermData (keeps it single-producer)
 
 static void jsonEsc(char*& p, const char* e, const char* s) {
   for (; s && *s && p < e - 8; ++s) {
@@ -19389,6 +19497,23 @@ static void webPushContacts() {
   g_web_mirror.pushTermData(s_webdata_buf);
 }
 
+static void webPushMentionNames(uint32_t request_id) {
+  if (!s_webdata_buf) return;
+  char names[k_mention_source_max][32];
+  const int count = collectRecentMentionNames(names, k_mention_source_max);
+  char* p = s_webdata_buf; const char* e = s_webdata_buf + WEBDATA_BUF;
+  p += snprintf(p, e - p, "{\"t\":\"mh\",\"q\":%lu,\"names\":[",
+                (unsigned long)request_id);
+  for (int i = 0; i < count && p < e - 48; ++i) {
+    if (i) *p++ = ',';
+    *p++ = '"';
+    jsonEsc(p, e, names[i]);
+    *p++ = '"';
+  }
+  p += snprintf(p, e - p, "]}");
+  g_web_mirror.pushTermData(s_webdata_buf);
+}
+
 static void webPushThreads() {
   if (!g_lv.task || !s_webdata_buf) return;
   char* p = s_webdata_buf; const char* e = s_webdata_buf + WEBDATA_BUF;
@@ -19599,6 +19724,7 @@ static bool handleWebDataCmd(const char* cmd) {
   if (a[0] == 's' && a[1] == 'g' && (a[2] == 0 || a[2] == ' ')) { webPushSettings(); return true; }
   if (a[0] == 's' && a[1] == 'r' && a[2] == ' ') { float fq=0,bw=0; int sf=0,cr=0,tx=0; sscanf(a+3, "%f %f %d %d %d", &fq,&bw,&sf,&cr,&tx); webSetRadio(fq,bw,sf,cr,tx); return true; }
   if (a[0] == 's' && a[1] == 't' && (a[2] == 0 || a[2] == ' ')) { webPushStatus(); return true; }
+  if (a[0] == 'm' && a[1] == 'h' && (a[2] == 0 || a[2] == ' ')) { webPushMentionNames((uint32_t)strtoul(a + 2, nullptr, 10)); return true; }
   if (a[0] == 'm' && a[1] == ' ')                 { webPushMessages(atoi(a + 2)); return true; }
   if (a[0] == 'o' && a[1] == 'c' && a[2] == ' ')  { webOpenContact(atoi(a + 3)); return true; }
   if (a[0] == 'o' && a[1] == 'h' && a[2] == ' ')  { webOpenChannel(atoi(a + 3)); return true; }
@@ -31133,6 +31259,7 @@ static void makeChatDetail(LvChatPanel& p) {
   lv_obj_add_event_cb(p.composer_ta, kbActivityPressCb, LV_EVENT_PRESSED, nullptr);
   // Grow / shrink the composer row as the message wraps (every text change).
   lv_obj_add_event_cb(p.composer_ta, composerAutoGrowCb, LV_EVENT_VALUE_CHANGED, &p);
+  lv_obj_add_event_cb(p.composer_ta, composerSuggestChangedCb, LV_EVENT_VALUE_CHANGED, nullptr);
   // Double-tap a word to select it; long-press for Cut/Copy/Paste/Select-All.
   lv_obj_add_event_cb(p.composer_ta, composerEditClickedCb, LV_EVENT_CLICKED, nullptr);
   lv_obj_add_event_cb(p.composer_ta, composerEditLongPressCb, LV_EVENT_LONG_PRESSED, nullptr);
@@ -35836,6 +35963,20 @@ static void updateTrackball(unsigned long now) {
     return;
   }
 
+  // Mention picker selector. It remains a NAV_SKIP overlay so the composer's
+  // focus/edit state is stable; trackball motion walks its private highlight.
+  if (s_mentionnav_active && s_mentionbox) {
+    s_tb_click_press = false;   // the button path confirms; never inject a pointer tap
+    if (!lv_obj_has_flag(s_tb_cursor, LV_OBJ_FLAG_HIDDEN))
+      lv_obj_add_flag(s_tb_cursor, LV_OBJ_FLAG_HIDDEN);
+    if (moved && (dx != 0 || dy != 0)) {
+      const int adx = dx < 0 ? -dx : dx, ady = dy < 0 ? -dy : dy;
+      mentionNavMove((adx >= ady ? dx : dy) > 0 ? 1 : -1);
+      if (g_lv.task) g_lv.task->noteUserInput();
+    }
+    return;
+  }
+
   // ---- Emoji picker selector mode ----
   // While the emoji sheet is open the trackball drives a grid highlight instead
   // of the soft cursor: each motion step moves one cell, the centre click
@@ -36450,7 +36591,7 @@ static void updatePagerEncoder(unsigned long now) {
     // @-mention contact picker (handleHwKey()'s Fn+Space entry / mentionNavConfirm()):
     // captures the encoder exclusively while active, same priority as the accent
     // picker and an open dropdown below (mention and accent never show at once —
-    // composerSuggestRefresh() -- so there's no ordering conflict between them).
+    // composerMentionRefresh() -- so there's no ordering conflict between them).
     const bool turned = (delta != 0);
     if (s_mentionbox_cell_n > 0) {
       for (; delta > 0; delta--) s_mentionnav_idx = (s_mentionnav_idx + 1) % (int)s_mentionbox_cell_n;
@@ -38447,7 +38588,7 @@ if (g_lv.task && g_lv.task->isManualLock()) {
     return;
   }
   txtMenuHide();   // any keypress while editing dismisses an open edit menu
-#if defined(TLORA_PAGER)
+#if CAP_KEYPAD_NAV
   // Accent-variant / @-mention popups (issues #22, #42) are otherwise
   // unreachable here: no touch, and their cells are NAV_SKIP_FLAG by design
   // (touch boards pick them by tap). The rotary encoder walks the highlighted
@@ -38461,10 +38602,19 @@ if (g_lv.task && g_lv.task->isManualLock()) {
   // vowel/consonant typed, so stealing focus immediately would swallow normal
   // typing -- it stays passive until explicitly armed with Fn(Alt)+Space.
   if (s_mentionnav_active) {
+#if defined(HAS_M9_KEYBOARD)
+    if (key == M9_KEY_UP)             { mentionNavMove(-1); return; }
+    if (key == M9_KEY_DOWN)           { mentionNavMove(+1); return; }
+    if (key == M9_KEY_LEFT || key == M9_KEY_RIGHT) {
+      mentionBoxHide();   // normal M9 caret handling continues below
+    } else if (key == M9_KEY_HW_BACK) { mentionBoxHide(); return; }
+#endif
     if (key == 0x08 || key == 0x7F) { mentionBoxHide(); return; }
     if (key == 0x0D)                { mentionNavConfirm(); return; }
-    return;   // swallow everything else while picking (typing, etc.)
+    // Printable input falls through to the textarea and re-filters the list.
   }
+#endif
+#if defined(TLORA_PAGER)
   if (s_accentnav_active) {
     if (key == 0x08 || key == 0x7F) { accentBoxHide(); return; }
     if (key == 0x0D)                { accentNavConfirm(); return; }
@@ -38609,7 +38759,7 @@ if (g_lv.task && g_lv.task->isManualLock()) {
     } else {
       lv_textarea_add_char(ta, (uint32_t)key);
     }
-    composerSuggestRefresh();   // @mention contact picker, else the accent box
+    composerMentionRefresh(ta);   // @mention contact picker, else the accent box
   }
   if (g_lv.task) g_lv.task->noteUserInput();
 }
@@ -45722,6 +45872,9 @@ void UITask::stepComposerAction(int delta) { _composer_action_idx += delta; }
 void UITask::userLedHandler() {}
 
 void UITask::discoveredContact(const ContactInfo& contact, bool is_new, uint8_t path_len) {
+#if !defined(HAS_TANMATSU)
+  s_web_rx_nudge = true;
+#endif
   /* `is_new=false` → contact is already in contacts[]; nothing to do (the
    * Discovered modal only shows pending nodes that haven't been added yet).
    * On `is_new=true` we either update the existing slot for this pubkey or
@@ -52951,6 +53104,14 @@ void UITask::loop() {
     } else if (_screen_off) {
       if (tb_pressed && s_user_btn_prev == HIGH) { wakeScreen(); s_tb_wake_consume = true; }
       s_tb_click_press = false;
+    } else if (s_mentionnav_active) {
+      // The mention rows are NAV_SKIP, so the trackball button confirms the
+      // private highlight instead of injecting a pointer tap behind the popup.
+      if (tb_pressed && s_user_btn_prev == HIGH) {
+        mentionNavConfirm();
+        s_tb_last_active_ms = now; noteUserInput();
+      }
+      s_tb_click_press = false;
     } else if (s_emoji_sheet) {
       // Emoji picker open: a fresh press inserts the highlighted glyph via the
       // selector instead of injecting a cursor tap. Edge-triggered so a held