diff --git a/tools/email_check.py b/tools/email_check.py
index 2b5ff5f..ff0c564 100644
--- a/tools/email_check.py
+++ b/tools/email_check.py
@@ -10,12 +10,20 @@ from email.header import decode_header
 import json
 import sys
 from datetime import datetime
+from pathlib import Path
+
+# Try keyring first
+sys.path.insert(0, str(Path(__file__).parent.parent))
+try:
+    from src.credential_store import get_secret
+except ImportError:
+    get_secret = lambda name: None
 
 # IMAP Configuration
-IMAP_SERVER = "mail.romfast.ro"
+IMAP_SERVER = get_secret("email_server") or "mail.romfast.ro"
 IMAP_PORT = 993
-IMAP_USER = "moltbot@romfast.ro"
-IMAP_PASS = "parola281234"
+IMAP_USER = get_secret("email_user") or "echo@romfast.ro"
+IMAP_PASS = get_secret("email_password") or ""
 
 def decode_mime_header(header):
     """Decode MIME encoded header"""
diff --git a/tools/email_process.py b/tools/email_process.py
index df99685..3b8b906 100755
--- a/tools/email_process.py
+++ b/tools/email_process.py
@@ -19,7 +19,20 @@ from email.header import decode_header
 from datetime import datetime
 from pathlib import Path
 
-# Load .env
+# Try keyring first, fall back to .env
+sys.path.insert(0, str(Path(__file__).parent.parent))
+try:
+    from src.credential_store import get_secret
+except ImportError:
+    get_secret = lambda name: None
+
+def _get(keyring_name, env_name, default=''):
+    val = get_secret(keyring_name)
+    if val:
+        return val
+    return os.environ.get(env_name, default)
+
+# Load .env as fallback
 env_path = Path(__file__).parent.parent / '.env'
 if env_path.exists():
     with open(env_path) as f:
@@ -30,10 +43,10 @@ if env_path.exists():
                 os.environ.setdefault(key, value)
 
 # Config
-IMAP_SERVER = os.environ.get('EMAIL_SERVER', 'mail.romfast.ro')
+IMAP_SERVER = _get('email_server', 'EMAIL_SERVER', 'mail.romfast.ro')
 IMAP_PORT = 993
-IMAP_USER = os.environ.get('EMAIL_USER', 'echo@romfast.ro')
-IMAP_PASS = os.environ.get('EMAIL_PASSWORD', '')
+IMAP_USER = _get('email_user', 'EMAIL_USER', 'echo@romfast.ro')
+IMAP_PASS = _get('email_password', 'EMAIL_PASSWORD')
 
 # Whitelist - only process emails from these addresses
 WHITELIST = [
diff --git a/tools/email_send.py b/tools/email_send.py
index 6b2e939..2ff071e 100644
--- a/tools/email_send.py
+++ b/tools/email_send.py
@@ -14,7 +14,21 @@ from email.header import Header
 from email.utils import formataddr
 from pathlib import Path
 
-# Load .env file
+# Try keyring first, fall back to .env
+sys.path.insert(0, str(Path(__file__).parent.parent))
+try:
+    from src.credential_store import get_secret
+except ImportError:
+    get_secret = lambda name: None
+
+def _get(keyring_name, env_name, default=''):
+    """Get credential from keyring first, then env, then default."""
+    val = get_secret(keyring_name)
+    if val:
+        return val
+    return os.environ.get(env_name, default)
+
+# Load .env file as fallback
 env_path = Path(__file__).parent.parent / '.env'
 if env_path.exists():
     with open(env_path) as f:
@@ -24,18 +38,19 @@ if env_path.exists():
                 key, value = line.split('=', 1)
                 os.environ.setdefault(key, value)
 
-# SMTP Configuration from environment
+# SMTP Configuration: keyring → env → defaults
 # Try Gmail first, fall back to romfast
-if os.environ.get('GMAIL_PASSWORD'):
+gmail_pass = _get('gmail_password', 'GMAIL_PASSWORD')
+if gmail_pass:
     SMTP_SERVER = 'smtp.gmail.com'
     SMTP_PORT = 465
-    SMTP_USER = os.environ.get('GMAIL_USER', 'mmarius28@gmail.com')
-    SMTP_PASS = os.environ.get('GMAIL_PASSWORD', '')
+    SMTP_USER = _get('gmail_user', 'GMAIL_USER', 'mmarius28@gmail.com')
+    SMTP_PASS = gmail_pass
 else:
-    SMTP_SERVER = os.environ.get('EMAIL_SERVER', 'mail.romfast.ro')
+    SMTP_SERVER = _get('email_server', 'EMAIL_SERVER', 'mail.romfast.ro')
     SMTP_PORT = 465
-    SMTP_USER = os.environ.get('EMAIL_USER', 'echo@romfast.ro')
-    SMTP_PASS = os.environ.get('EMAIL_PASSWORD', '')
+    SMTP_USER = _get('email_user', 'EMAIL_USER', 'echo@romfast.ro')
+    SMTP_PASS = _get('email_password', 'EMAIL_PASSWORD')
 FROM_NAME = "Echo"
 
 def send_email(to_email: str, subject: str, body: str, html: bool = False) -> dict: