1 files changed, 5 insertions, 1 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index eaf908f8..f713b926 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -572,7 +572,11 @@ clientSession s@Session{..} sock cnum h = do
                             Left e    ->
                                 -- HACK: split nospam from hex toxid
                                 case dhtParseId (take 64 s) of
-                                    Left e -> "Error: " ++ e
+                                    Left e -> case Tox.parseNoSpamId $ T.pack s of
+                                                Left ej -> if elem '@' s
+                                                            then "Error: " ++ ej
+                                                            else "Error: " ++ e
+                                                Right jid -> show jid
                                     Right nid -> show nid ++ " nospam:" ++ drop 64 s
                             Right nid -> show nid