diff --git a/speaker.py b/speaker.py
index 86569f397..3426e9e29 100644
--- a/speaker.py
+++ b/speaker.py
@@ -81,7 +81,12 @@ def _speakerPronounce(baseDir: str, sayText: str, translate: {}) -> str:
             "XMPP": "X-M-P-P",
             "xmpp": "X-M-P-P",
             "sql": "S-Q-L",
+            "PSQL": "Postgres S-Q-L",
             "SQL": "S-Q-L",
+            "KMail": "K-Mail",
+            "gmail": "G-mail",
+            "Gmail": "G-mail",
+            "OpenPGP": "Open P-G-P",
             "Tor": "Toor",
             "🤔": ". " + translate["thinking emoji"],
             "RT @": "Re-Tweet ",
@@ -149,7 +154,7 @@ def speakerReplaceLinks(sayText: str, translate: {},
         if word.startswith('@') and not prevWord.endswith('RT'):
             if translate.get('mentioning'):
                 replacements[word] = \
-                    translate['mentioning'] + ' ' + word[1:] + ','
+                    translate['mentioning'] + ' ' + word[1:] + ', '
         prevWord = word
 
         domain = None