diff --git a/CyberCP/settings.py b/CyberCP/settings.py
index b0026fdeb..3cc44a603 100644
--- a/CyberCP/settings.py
+++ b/CyberCP/settings.py
@@ -76,6 +76,7 @@ INSTALLED_APPS = [
     'IncBackups',
     'aiScanner',
     'webmail',
+    'emailDelivery',
     #    'WebTerminal'
 ]
 
diff --git a/CyberCP/urls.py b/CyberCP/urls.py
index 6cbfbe68c..51e1a13ad 100644
--- a/CyberCP/urls.py
+++ b/CyberCP/urls.py
@@ -46,5 +46,6 @@ urlpatterns = [
     path('IncrementalBackups/', include('IncBackups.urls')),
     path('aiscanner/', include('aiScanner.urls')),
     path('webmail/', include('webmail.urls')),
+    path('emailDelivery/', include('emailDelivery.urls')),
     # path('Terminal/', include('WebTerminal.urls')),
 ]
diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 8e2053473..f09d6fe28 100644
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -1937,8 +1937,12 @@
                 <a href="{% url 'Rspamd' %}" class="menu-item">
                     <span>RSPAMD</span>
                 </a>
+                <a href="{% url 'emailDeliveryHome' %}" class="menu-item">
+                    <span>Email Delivery</span>
+                    <span class="badge">NEW</span>
+                </a>
             </div>
-            
+
             <a href="#" class="menu-item" onclick="toggleSubmenu('manage-services-submenu', this); return false;">
                 <div class="icon-wrapper">
                     <i class="fas fa-folder-open"></i>
diff --git a/docs/CYBERMAIL_SETUP_GUIDE.md b/docs/CYBERMAIL_SETUP_GUIDE.md
new file mode 100644
index 000000000..3cede4155
--- /dev/null
+++ b/docs/CYBERMAIL_SETUP_GUIDE.md
@@ -0,0 +1,266 @@
+# CyberMail Email Delivery — Setup & Administration Guide
+
+**Feature**: CyberMail Email Delivery Integration
+**CyberPanel Version**: 2.4.5+
+**Platform**: https://platform.cyberpersons.com
+**Last Updated**: 2026-03-06
+
+---
+
+## Overview
+
+CyberMail Email Delivery is a built-in CyberPanel feature that routes outgoing emails through CyberMail's optimized delivery infrastructure. It solves common email deliverability problems — emails landing in spam, IP blacklisting, missing DNS records — by providing dedicated sending servers, automatic DNS configuration, and real-time delivery analytics.
+
+### Key Benefits
+
+- **15,000 emails/month free** on the Free plan
+- **Automatic DNS setup** — SPF, DKIM, and DMARC records configured in one click
+- **SMTP relay** — route all server email through CyberMail with one toggle
+- **Real-time analytics** — delivery logs, bounce tracking, reputation monitoring
+- **Multi-region delivery** — 4 delivery nodes with 99.9% uptime SLA
+- **98%+ inbox rate** across major providers (Gmail, Outlook, Yahoo)
+
+---
+
+## Prerequisites
+
+1. CyberPanel 2.4.5 or later installed
+2. Active internet connection from the server
+3. PowerDNS running (for automatic DNS configuration)
+4. Postfix installed (for SMTP relay feature)
+
+---
+
+## Installation
+
+The CyberMail module is included in CyberPanel 2.4.5+. No separate installation needed.
+
+### Verify the Module
+
+```bash
+# Check the app exists
+ls /usr/local/CyberCP/emailDelivery/
+
+# Check it's in INSTALLED_APPS
+grep -n "emailDelivery" /usr/local/CyberCP/CyberCP/settings.py
+
+# Run migrations if needed
+cd /usr/local/CyberCP
+python manage.py migrate emailDelivery
+```
+
+### Database Tables
+
+The module creates two tables:
+
+| Table | Purpose |
+|-------|---------|
+| `cybermail_accounts` | Stores per-admin CyberMail account connections |
+| `cybermail_domains` | Tracks sending domains and their verification status |
+
+---
+
+## Getting Started
+
+### Step 1: Access CyberMail
+
+Navigate to: **https://your-server:8090/emailDelivery/**
+
+You'll see the CyberMail marketing page with plan information and a "Get Started Free" button.
+
+### Step 2: Connect Your Account
+
+1. Click **"Get Started Free"**
+2. Enter your email address (defaults to your CyberPanel admin email)
+3. Create a password for your CyberMail account
+4. Click **Connect**
+
+This registers your account on the CyberMail platform and obtains an API key that's stored locally for future API calls.
+
+> **Note**: If you already have a CyberMail account on the platform, use the same email and password. The system will link your existing account.
+
+### Step 3: Add Sending Domains
+
+1. After connecting, you'll see the dashboard
+2. Go to the **Domains** tab
+3. Click **"Add Domain"**
+4. Enter your domain name (e.g., `example.com`)
+5. Click **Add**
+
+The system will:
+- Register the domain on the CyberMail platform
+- Automatically create SPF, DKIM, and DMARC DNS records in PowerDNS
+- Report how many DNS records were configured
+
+### Step 4: Verify Domain
+
+1. Click **"Verify"** next to your domain
+2. The system checks SPF, DKIM, and DMARC records
+3. Green checkmarks appear for each verified record
+4. Status changes to "Verified" when all records pass
+
+> **DNS Propagation**: If verification fails immediately after adding, wait 5-10 minutes for DNS propagation and try again.
+
+### Step 5: Enable SMTP Relay (Optional)
+
+The SMTP relay routes ALL outgoing email from your server through CyberMail:
+
+1. Go to the **Relay** tab
+2. Click **"Enable Relay"**
+3. The system will:
+   - Create (or rotate) SMTP credentials on the platform
+   - Configure Postfix with the relay host (`mail.cyberpersons.com:587`)
+   - Set up SASL authentication
+   - Enable TLS encryption
+
+**What gets configured in Postfix** (`/etc/postfix/main.cf`):
+```
+relayhost = [mail.cyberpersons.com]:587
+smtp_sasl_auth_enable = yes
+smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
+smtp_sasl_security_options = noanonymous
+smtp_tls_security_level = encrypt
+```
+
+---
+
+## Dashboard Overview
+
+After connecting, the dashboard provides five tabs:
+
+### Domains Tab
+- Lists all sending domains with verification status
+- SPF, DKIM, DMARC status badges (green = verified)
+- Actions: Verify, Auto-Configure DNS, Remove
+- DNS auto-configuration works when the domain exists in PowerDNS
+
+### SMTP Tab
+- Manage SMTP credentials for sending
+- Create new credentials with descriptions
+- Rotate passwords (one-time display)
+- Delete unused credentials
+
+### Relay Tab
+- Shows current relay status (Enabled/Disabled)
+- Displays relay host and port
+- Enable/Disable toggle
+- Relay info: `mail.cyberpersons.com:587` with STARTTLS
+
+### Logs Tab
+- Paginated delivery logs
+- Filter by: Status (delivered/bounced/failed), Days (1-30)
+- Shows: Date, From, To, Subject, Status
+- Color-coded status badges
+
+### Stats Tab
+- Aggregate stats: Total Sent, Delivered, Bounced, Failed, Delivery Rate
+- Per-domain breakdown table
+- Useful for identifying domains with deliverability issues
+
+---
+
+## Plans & Pricing
+
+| Plan | Price | Emails/Month | Features |
+|------|-------|-------------|----------|
+| **Free** | $0 | 15,000 | Shared infrastructure, basic analytics |
+| **Starter** | $15/mo | 100,000 | Priority support, advanced analytics |
+| **Professional** | $90/mo | 500,000 | Dedicated IPs, custom DKIM, webhooks |
+| **Enterprise** | $299/mo | 2,000,000 | SLA guarantee, account manager, custom limits |
+
+Upgrade at: https://platform.cyberpersons.com
+
+---
+
+## Promotional Banners
+
+CyberMail banners appear on email-related pages to inform users about the delivery service:
+
+- Mail Functions (`/mailServer/`)
+- Create Email Account
+- DKIM Manager
+- Webmail
+- Email Premium
+- Email Marketing
+
+Banners are dismissible with a 7-day cookie-based suppression. They show:
+- "Stop Landing in Spam" headline
+- Brief feature description
+- "Get Started Free" CTA linking to `/emailDelivery/`
+
+---
+
+## Disconnecting
+
+1. Go to **https://your-server:8090/emailDelivery/**
+2. Click the **"Disconnect"** button
+3. Confirm the action
+
+Disconnecting will:
+- Disable SMTP relay if active (remove Postfix relay config)
+- Clear the stored API key
+- Remove local domain records
+- Reset SMTP credential references
+
+> **Note**: Your CyberMail platform account is NOT deleted. You can reconnect later with the same credentials.
+
+---
+
+## Troubleshooting
+
+### "Account not connected" error
+The admin session doesn't have an active CyberMail connection. Click "Get Started Free" to connect.
+
+### DNS records not auto-configured
+- The domain must exist in PowerDNS on this server
+- Check if the domain was created via CyberPanel's DNS management
+- If using external DNS, add records manually using the DNS records shown on the platform
+
+### Domain verification failing
+- Wait 5-10 minutes after DNS changes for propagation
+- Verify records exist: `dig TXT example.com +short`
+- Check for conflicting SPF records (only one SPF record allowed per domain)
+
+### SMTP relay not working
+- Check Postfix status: `systemctl status postfix`
+- Verify relay config: `grep relayhost /etc/postfix/main.cf`
+- Check SASL credentials: `cat /etc/postfix/sasl_passwd`
+- Test connectivity: `telnet mail.cyberpersons.com 587`
+- Check mail queue: `mailq`
+- View Postfix logs: `tail -f /var/log/mail.log`
+
+### Relay shows "Failed to configure"
+- Ensure `/usr/local/CyberCP/plogical/mailUtilities.py` has the `configureRelayHost` method
+- Check file permissions on `/etc/postfix/sasl_passwd`
+- Verify Postfix is installed and running
+
+### Emails still going to spam
+1. Verify all DNS records (SPF, DKIM, DMARC) are green
+2. Check your domain's reputation at https://www.mail-tester.com
+3. Ensure you're not sending to purchased/scraped lists
+4. Consider upgrading to a plan with dedicated IPs
+
+---
+
+## File Reference
+
+| File | Purpose |
+|------|---------|
+| `emailDelivery/emailDeliveryManager.py` | Core business logic, platform API calls |
+| `emailDelivery/models.py` | Database models (CyberMailAccount, CyberMailDomain) |
+| `emailDelivery/views.py` | Django view functions (thin wrappers) |
+| `emailDelivery/urls.py` | URL routing (18 endpoints) |
+| `emailDelivery/static/emailDelivery/emailDelivery.js` | AngularJS controller |
+| `emailDelivery/templates/emailDelivery/index.html` | Single-page template (marketing + dashboard) |
+| `plogical/mailUtilities.py` | Postfix relay configuration (configureRelayHost/removeRelayHost) |
+
+---
+
+## Security
+
+- API keys are stored per-admin in the local database, never in config files
+- All platform API calls use HTTPS with Bearer token authentication
+- SMTP credentials use SASL over TLS (STARTTLS on port 587)
+- SASL password file is chmod 600 (root-only readable)
+- Session-based authentication with CSRF protection on all endpoints
+- Passwords are never stored locally — only on the platform
diff --git a/docs/CYBERMAIL_TECHNICAL_REFERENCE.md b/docs/CYBERMAIL_TECHNICAL_REFERENCE.md
new file mode 100644
index 000000000..4055d1325
--- /dev/null
+++ b/docs/CYBERMAIL_TECHNICAL_REFERENCE.md
@@ -0,0 +1,393 @@
+# CyberMail Email Delivery — Technical Reference
+
+**Module**: `emailDelivery`
+**Platform API Base**: `https://platform.cyberpersons.com/email/cp/`
+**Last Updated**: 2026-03-06
+
+---
+
+## Architecture
+
+```
+CyberPanel UI (AngularJS)
+    |
+    v
+Django Views (emailDelivery/views.py)
+    |
+    v
+EmailDeliveryManager (emailDelivery/emailDeliveryManager.py)
+    |
+    ├──> CyberMail Platform API (HTTPS POST, Bearer auth)
+    ├──> PowerDNS (via dnsUtilities.DNS.createDNSRecord)
+    └──> Postfix (via mailUtilities.py subprocess as root)
+```
+
+### Design Patterns
+
+- **Manager Class Pattern**: All business logic in `EmailDeliveryManager`, views are thin wrappers
+- **Per-User API Keys**: Each CyberPanel admin gets their own platform API key (no server-level key)
+- **AngularJS SPA**: Single template with conditional rendering based on `isConnected` state
+- **Subprocess for Root Operations**: Postfix relay config runs via `ProcessUtilities.outputExecutioner()` which executes as root
+
+---
+
+## Database Models
+
+### CyberMailAccount (`cybermail_accounts`)
+
+```python
+class CyberMailAccount(models.Model):
+    admin              = OneToOneField(Administrator, CASCADE)  # 1:1 with admin
+    platform_account_id = IntegerField(null=True)               # Platform's account ID
+    api_key            = CharField(max_length=255)               # Per-user Bearer token
+    email              = CharField(max_length=255)               # Platform email
+    plan_name          = CharField(default='Free')               # Display name
+    plan_slug          = CharField(default='free')               # free/starter/professional/enterprise
+    emails_per_month   = IntegerField(default=15000)             # Plan limit
+    is_connected       = BooleanField(default=False)             # Active connection
+    relay_enabled      = BooleanField(default=False)             # Postfix relay active
+    smtp_credential_id = IntegerField(null=True)                 # Active relay credential
+    smtp_username      = CharField(max_length=255)               # Relay SMTP username
+    smtp_host          = CharField(default='mail.cyberpersons.com')
+    smtp_port          = IntegerField(default=587)
+    created_at         = DateTimeField(auto_now_add=True)
+    updated_at         = DateTimeField(auto_now=True)
+```
+
+### CyberMailDomain (`cybermail_domains`)
+
+```python
+class CyberMailDomain(models.Model):
+    account            = ForeignKey(CyberMailAccount, CASCADE)
+    domain             = CharField(max_length=255)
+    platform_domain_id = IntegerField(null=True)
+    status             = CharField(default='pending')  # pending/verified
+    spf_verified       = BooleanField(default=False)
+    dkim_verified      = BooleanField(default=False)
+    dmarc_verified     = BooleanField(default=False)
+    dns_configured     = BooleanField(default=False)   # Auto-configured in PowerDNS
+    created_at         = DateTimeField(auto_now_add=True)
+```
+
+---
+
+## API Endpoints (CyberPanel Internal)
+
+All endpoints are POST, require authenticated CyberPanel session, and return JSON.
+
+### Account Management
+
+| Endpoint | Method | Purpose | Request Body |
+|----------|--------|---------|-------------|
+| `/emailDelivery/` | GET | Render page | — |
+| `/emailDelivery/connect/` | POST | Register/connect account | `{email, password}` |
+| `/emailDelivery/status/` | POST | Get account status + sync domains | — |
+| `/emailDelivery/disconnect/` | POST | Disconnect account, cleanup | — |
+
+### Domain Management
+
+| Endpoint | Method | Purpose | Request Body |
+|----------|--------|---------|-------------|
+| `/emailDelivery/domains/add/` | POST | Add sending domain | `{domain}` |
+| `/emailDelivery/domains/list/` | POST | List domains with status | — |
+| `/emailDelivery/domains/verify/` | POST | Verify DNS records | `{domain}` |
+| `/emailDelivery/domains/dns-records/` | POST | Get required DNS records | `{domain}` |
+| `/emailDelivery/domains/auto-configure-dns/` | POST | Auto-add DNS to PowerDNS | `{domain}` |
+| `/emailDelivery/domains/remove/` | POST | Remove sending domain | `{domain}` |
+
+### SMTP Credentials
+
+| Endpoint | Method | Purpose | Request Body |
+|----------|--------|---------|-------------|
+| `/emailDelivery/smtp/create/` | POST | Create SMTP credential | `{description}` |
+| `/emailDelivery/smtp/list/` | POST | List all credentials | — |
+| `/emailDelivery/smtp/rotate/` | POST | Rotate credential password | `{credential_id}` |
+| `/emailDelivery/smtp/delete/` | POST | Delete credential | `{credential_id}` |
+
+### Relay
+
+| Endpoint | Method | Purpose | Request Body |
+|----------|--------|---------|-------------|
+| `/emailDelivery/relay/enable/` | POST | Enable Postfix SMTP relay | — |
+| `/emailDelivery/relay/disable/` | POST | Disable Postfix SMTP relay | — |
+
+### Analytics
+
+| Endpoint | Method | Purpose | Request Body |
+|----------|--------|---------|-------------|
+| `/emailDelivery/stats/` | POST | Aggregate sending stats | — |
+| `/emailDelivery/stats/domains/` | POST | Per-domain stats | — |
+| `/emailDelivery/logs/` | POST | Paginated delivery logs | `{page, per_page, status, from_domain, days}` |
+
+### Health
+
+| Endpoint | Method | Purpose | Request Body |
+|----------|--------|---------|-------------|
+| `/emailDelivery/health/` | POST | Platform health check | — |
+
+---
+
+## Platform API Mapping
+
+Each CyberPanel endpoint maps to a platform API call:
+
+| CyberPanel Method | Platform Endpoint | Auth | Notes |
+|-------------------|-------------------|------|-------|
+| `connect()` | `api/register/` | None (public) | Returns `api_key` for future calls |
+| `getStatus()` | `api/account/` + `api/domains/list/` | Bearer | Syncs plan + domains |
+| `addDomain()` | `api/domains/add/` + `api/domains/dns-records/` | Bearer | Auto-configures DNS |
+| `listDomains()` | `api/domains/list/` | Bearer | Syncs verification status |
+| `verifyDomain()` | `api/domains/verify/` | Bearer | Returns spf/dkim/dmarc booleans |
+| `getDnsRecords()` | `api/domains/dns-records/` | Bearer | Returns required records |
+| `removeDomain()` | `api/domains/remove/` | Bearer | — |
+| `createSmtpCredential()` | `api/smtp/create/` | Bearer | Returns one-time password |
+| `listSmtpCredentials()` | `api/smtp/list/` | Bearer | Normalizes `id` → `credential_id` |
+| `rotateSmtpPassword()` | `api/smtp/rotate/` | Bearer | Normalizes `new_password` → `password` |
+| `deleteSmtpCredential()` | `api/smtp/delete/` | Bearer | Clears relay if active credential |
+| `enableRelay()` | `api/smtp/create/` or `api/smtp/rotate/` | Bearer | Then configures Postfix |
+| `getStats()` | `api/stats/` | Bearer | — |
+| `getDomainStats()` | `api/stats/domains/` | Bearer | Converts dict → array |
+| `getLogs()` | `api/logs/` | Bearer | Maps field names for JS |
+| `checkStatus()` | `api/health/` | None | — |
+
+### API Response Normalization
+
+The manager normalizes platform responses for frontend compatibility:
+
+| Platform Field | CyberPanel Field | Method |
+|---------------|-----------------|--------|
+| `id` (credential) | `credential_id` | `listSmtpCredentials()` |
+| `new_password` | `password` | `rotateSmtpPassword()` |
+| `queued_at` | `date` | `getLogs()` |
+| `from_email` | `from` | `getLogs()` |
+| `to_email` | `to` | `getLogs()` |
+| `domains` (dict) | `domains` (array) | `getDomainStats()` |
+
+---
+
+## Connection Flow
+
+```
+1. User clicks "Get Started Free"
+2. JS sends POST /emailDelivery/connect/ {email, password}
+3. Manager calls platform POST api/register/ (no auth)
+4. Platform returns {success, data: {api_key, account_id, plan_name, ...}}
+5. Manager creates/updates CyberMailAccount with api_key
+6. All subsequent calls use Authorization: Bearer <api_key>
+```
+
+### Reconnection Behavior
+
+When connecting with an existing `CyberMailAccount` record:
+- Updates email, api_key, platform_account_id, plan info
+- Resets: `smtp_credential_id=None`, `smtp_username=''`, `relay_enabled=False`
+- Deletes all local `CyberMailDomain` records (stale data)
+
+### Disconnection Behavior
+
+- Disables Postfix relay if active
+- Clears: `is_connected`, `relay_enabled`, `api_key`, `smtp_credential_id`, `smtp_username`, `platform_account_id`
+- Deletes all local domain records
+- Does NOT delete the platform account
+
+---
+
+## DNS Auto-Configuration
+
+### Flow
+
+```
+1. User adds domain via addDomain()
+2. Manager calls platform api/domains/add/
+3. Manager calls _autoConfigureDnsForDomain()
+4.   → Finds domain zone in PowerDNS (dns.models.Domains)
+5.   → Calls platform api/domains/dns-records/ to get required records
+6.   → For each record: DNS.createDNSRecord(zone, host, type, value, priority, ttl)
+7.   → Marks CyberMailDomain.dns_configured = True
+8. User clicks "Verify" → calls platform api/domains/verify/
+9. Platform checks DNS → returns spf/dkim/dmarc booleans
+```
+
+### DNS Record Types Created
+
+| Record | Type | Example Value |
+|--------|------|---------------|
+| SPF | TXT | `v=spf1 include:spf.cyberpersons.com ~all` |
+| DKIM | TXT | `v=DKIM1; k=rsa; p=MIIBIjANBg...` |
+| DMARC | TXT | `v=DMARC1; p=quarantine; rua=mailto:dmarc@...` |
+
+### When Auto-Configuration Fails
+
+- Domain not in PowerDNS → returns message to add records manually
+- Platform API unreachable → returns connection error
+- Individual record creation fails → logged, continues with remaining records
+
+---
+
+## SMTP Relay Configuration
+
+### Enable Relay Flow
+
+```
+1. Manager checks account.smtp_credential_id
+2. If no credential:
+   → POST api/smtp/create/ {email, description: "CyberPanel Relay"}
+   → Stores credential_id, username, gets one-time password
+3. If credential exists:
+   → POST api/smtp/rotate/ {email, credential_id}
+   → Gets new_password
+4. Calls subprocess: python mailUtilities.py configureRelayHost
+   --smtpHost mail.cyberpersons.com --smtpPort 587
+   --smtpUser <username> --smtpPassword <password>
+5. mailUtilities.py (runs as root):
+   → Writes /etc/postfix/main.cf relay lines
+   → Writes /etc/postfix/sasl_passwd
+   → chmod 600, postmap, systemctl reload postfix
+6. Sets account.relay_enabled = True
+```
+
+### Postfix Configuration Applied
+
+```ini
+# Added to /etc/postfix/main.cf
+relayhost = [mail.cyberpersons.com]:587
+smtp_sasl_auth_enable = yes
+smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
+smtp_sasl_security_options = noanonymous
+smtp_tls_security_level = encrypt
+```
+
+```
+# /etc/postfix/sasl_passwd
+[mail.cyberpersons.com]:587 username:password
+```
+
+### Disable Relay
+
+```
+1. Calls subprocess: python mailUtilities.py removeRelayHost
+2. mailUtilities.py removes relay lines from main.cf
+3. Restores smtp_tls_security_level = may
+4. Deletes sasl_passwd and .db files
+5. Reloads Postfix
+6. Sets account.relay_enabled = False
+```
+
+### Output Parsing
+
+The subprocess prints `1,None` on success. The manager checks for `'1,None' in output` (not `startswith`) because Python SyntaxWarnings may appear before the success output.
+
+---
+
+## Frontend Architecture
+
+### Template: `emailDelivery/templates/emailDelivery/index.html`
+
+- Extends `baseTemplate/index.html`
+- Uses AngularJS 1.6.5 with `{$ $}` interpolation (not `{{ }}`)
+- CSS classes use `ed-` prefix
+- Two views controlled by Django `{% if isConnected %}`:
+  - Marketing landing page (not connected)
+  - Dashboard with tabs (connected)
+
+### Controller: `emailDeliveryCtrl`
+
+Located in `emailDelivery/static/emailDelivery/emailDelivery.js`
+
+Key state variables:
+```javascript
+$scope.isConnected      // Boolean — dashboard vs marketing view
+$scope.activeTab        // 'domains' | 'smtp' | 'relay' | 'logs' | 'stats'
+$scope.account          // Account object from getStatus
+$scope.domains          // Array of domain objects
+$scope.smtpCredentials  // Array of SMTP credential objects
+$scope.stats            // Aggregate stats object
+$scope.domainStats      // Array of per-domain stats
+$scope.logs             // Array of log entries
+$scope.logFilters       // {status, from_domain, days}
+$scope.logsPage         // Current log page number
+$scope.logsTotalPages   // Total log pages
+```
+
+### Modal Handling
+
+Bootstrap 3 modals are placed OUTSIDE the `ng-controller` div (AngularJS scope limitation). Modal forms use jQuery + `onclick` handlers that call standalone functions (`cmConnect()`, `cmAddDomain()`, etc.) which make AJAX calls with `$.ajax()` and CSRF tokens.
+
+### CSRF Token
+
+All AJAX calls include the CSRF token from cookies:
+```javascript
+function getCookie(name) {
+    var value = "; " + document.cookie;
+    var parts = value.split("; " + name + "=");
+    if (parts.length == 2) return parts.pop().split(";").shift();
+}
+```
+
+---
+
+## Error Handling
+
+### API Errors
+- Connection timeout: 30-second timeout on all platform API calls
+- Connection errors: caught and returned as `{success: false, error: "Could not connect..."}`
+- Missing API key: `{success: false, error: "No API key found. Please reconnect your account."}`
+
+### Logging
+All errors logged via `CyberCPLogFileWriter.writeToFile()` with format:
+```
+[EmailDeliveryManager.<method>] Error: <message>
+```
+
+Log file: `/home/cyberpanel/error-logs.txt`
+
+---
+
+## Banner System
+
+Promotional banners appear on 6 email-related pages:
+
+| Page | Template Path |
+|------|--------------|
+| Mail Functions | `mailServer/templates/mailServer/index.html` |
+| Create Email | `mailServer/templates/mailServer/createEmailAccount.html` |
+| DKIM Manager | `mailServer/templates/mailServer/dkimManager.html` |
+| Webmail | `webmail/templates/webmail/index.html` |
+| Email Premium | `emailPremium/templates/emailPremium/emailPage.html` |
+| Email Marketing | `emailMarketing/templates/emailMarketing/emailMarketing.html` |
+
+### Banner Behavior
+- Hidden by default (`display:none`)
+- Shown via JS if `cybermail_dismiss=1` cookie is NOT present
+- Dismiss button sets cookie with 7-day expiry (`max-age=604800`)
+- Links to `/emailDelivery/`
+
+---
+
+## File Structure
+
+```
+emailDelivery/
+├── __init__.py
+├── apps.py                          # Django app config
+├── models.py                        # CyberMailAccount, CyberMailDomain
+├── views.py                         # Thin view wrappers (18 endpoints)
+├── urls.py                          # URL patterns
+├── emailDeliveryManager.py          # Core business logic (~743 lines)
+├── migrations/
+│   └── __init__.py
+├── static/
+│   └── emailDelivery/
+│       └── emailDelivery.js         # AngularJS controller
+└── templates/
+    └── emailDelivery/
+        └── index.html               # SPA template (marketing + dashboard)
+```
+
+### Related Files
+
+| File | Modifications |
+|------|--------------|
+| `CyberCP/settings.py` | Added `'emailDelivery'` to `INSTALLED_APPS` |
+| `CyberCP/urls.py` | Added `path('emailDelivery/', include('emailDelivery.urls'))` |
+| `plogical/mailUtilities.py` | Added `configureRelayHost()` and `removeRelayHost()` static methods + argparse args |
diff --git a/docs/CYBERMAIL_USER_GUIDE.md b/docs/CYBERMAIL_USER_GUIDE.md
new file mode 100644
index 000000000..1ee16eaf5
--- /dev/null
+++ b/docs/CYBERMAIL_USER_GUIDE.md
@@ -0,0 +1,188 @@
+# CyberMail Email Delivery — User Guide
+
+**For**: CyberPanel users and resellers
+**Last Updated**: 2026-03-06
+
+---
+
+## What is CyberMail?
+
+CyberMail is CyberPanel's built-in email delivery service. It routes your outgoing emails through optimized servers so they land in the inbox instead of spam. Every CyberPanel installation includes CyberMail with a free tier of 15,000 emails per month.
+
+---
+
+## Quick Start
+
+### 1. Open CyberMail
+
+Log into CyberPanel and navigate to: **Email > Email Delivery** or go directly to `https://your-server:8090/emailDelivery/`
+
+### 2. Create Your Account
+
+- Click **"Get Started Free"**
+- Enter your email address
+- Choose a password
+- Click **Connect**
+
+You'll immediately get access to the dashboard with the Free plan (15,000 emails/month).
+
+### 3. Add Your Domain
+
+- Go to the **Domains** tab
+- Click **"Add Domain"**
+- Type your domain name (e.g., `mydomain.com`)
+- Click **Add**
+
+CyberMail will automatically set up the DNS records needed for email delivery (SPF, DKIM, DMARC). If your domain's DNS is managed by CyberPanel's PowerDNS, this happens instantly.
+
+### 4. Verify Your Domain
+
+- Click **"Verify"** next to your domain
+- Check that SPF, DKIM, and DMARC all show green checkmarks
+- If any are red, wait a few minutes for DNS propagation and verify again
+
+### 5. Start Sending
+
+Once your domain is verified, emails sent from that domain will benefit from CyberMail's delivery optimization. For maximum deliverability, enable the SMTP relay.
+
+---
+
+## Features
+
+### Domain Management
+
+Add multiple sending domains to your CyberMail account. Each domain gets:
+
+- **SPF record** — tells receivers your emails are authorized
+- **DKIM signing** — cryptographically signs your emails to prevent tampering
+- **DMARC policy** — instructs receivers how to handle unauthenticated emails
+
+**Status indicators:**
+- Gray badge = Not verified
+- Green badge = Verified and active
+
+**Actions:**
+- **Verify** — recheck DNS records
+- **Auto DNS** — reconfigure DNS records in PowerDNS (if records were deleted)
+- **Remove** — remove the domain from CyberMail
+
+### SMTP Credentials
+
+Create credentials for sending emails through CyberMail's SMTP servers:
+
+- **Create** — generates a username and one-time password
+- **Rotate** — generates a new password (old one stops working)
+- **Delete** — permanently removes the credential
+
+> **Important**: The password is shown only once when created or rotated. Copy it immediately.
+
+**SMTP Settings for manual configuration:**
+| Setting | Value |
+|---------|-------|
+| Host | `mail.cyberpersons.com` |
+| Port | `587` |
+| Security | STARTTLS |
+| Authentication | Login (SASL) |
+| Username | Shown after creation |
+| Password | Shown once after creation |
+
+### SMTP Relay
+
+The easiest way to use CyberMail — route ALL outgoing email from your server automatically:
+
+- **Enable** — one click to configure everything
+- **Disable** — one click to revert to direct sending
+
+When enabled, every email your server sends (from all websites, all email accounts) goes through CyberMail. No application-level changes needed.
+
+### Delivery Logs
+
+Monitor every email sent through CyberMail:
+
+- **Filter by status**: All, Delivered, Bounced, Failed, Deferred
+- **Filter by time**: Last 1, 3, 7, 14, or 30 days
+- **View details**: Date, sender, recipient, subject, delivery status
+
+### Statistics
+
+Track your email performance:
+
+- **Total Sent** — emails sent this billing period
+- **Delivered** — successfully delivered to recipient
+- **Bounced** — rejected by recipient server
+- **Failed** — permanent delivery failures
+- **Delivery Rate** — percentage of successful deliveries
+- **Per-Domain Breakdown** — stats for each sending domain
+
+### Usage Tracking
+
+The dashboard shows a progress bar of your monthly email usage:
+- Green = under 80% usage
+- Yellow/warning = approaching limit
+- An upgrade banner appears when you're near your plan limit
+
+---
+
+## Plans
+
+| | Free | Starter | Professional | Enterprise |
+|---|---|---|---|---|
+| **Price** | $0/mo | $15/mo | $90/mo | $299/mo |
+| **Emails** | 15,000 | 100,000 | 500,000 | 2,000,000 |
+| **Infrastructure** | Shared | Shared | Dedicated IPs | Dedicated IPs |
+| **Analytics** | Basic | Advanced | Advanced | Advanced |
+| **Support** | Community | Priority | Priority | Dedicated Manager |
+| **Custom DKIM** | No | No | Yes | Yes |
+| **Webhooks** | No | No | Yes | Yes |
+| **SLA** | — | — | — | 99.9% |
+
+To upgrade, visit the CyberMail platform at https://platform.cyberpersons.com
+
+---
+
+## Disconnecting Your Account
+
+If you need to disconnect CyberMail:
+
+1. Go to the CyberMail dashboard
+2. Click the **"Disconnect"** button
+3. Confirm the action
+
+**What happens:**
+- SMTP relay is disabled (if it was enabled)
+- Postfix returns to direct sending
+- Local data (domains, credentials) is cleared
+- Your platform account is preserved — you can reconnect anytime
+
+---
+
+## FAQ
+
+**Q: Will enabling relay affect my existing email accounts?**
+A: Yes, ALL outgoing email from the server will route through CyberMail. This includes emails from websites (contact forms, notifications) and email accounts (Postfix). Incoming email is not affected.
+
+**Q: Can I use CyberMail without the relay?**
+A: Yes. You can use SMTP credentials directly in your applications (WordPress SMTP plugins, custom scripts, etc.) without enabling the server-wide relay.
+
+**Q: What happens if I exceed my plan limit?**
+A: Check with the platform for current overage policies. The dashboard shows your usage so you can monitor and upgrade before hitting limits.
+
+**Q: Can I use CyberMail for bulk marketing emails?**
+A: CyberMail is designed for transactional and legitimate business email. Bulk marketing to purchased lists is not permitted. Use it for newsletters to opted-in subscribers, transactional emails, and business communications.
+
+**Q: My domain DNS is not managed by CyberPanel. Can I still use CyberMail?**
+A: Yes. After adding the domain, click "DNS Records" to see the required records. Add them manually at your DNS provider (Cloudflare, Route53, etc.).
+
+**Q: I disconnected and reconnected. Why are my old domains gone?**
+A: Reconnecting clears stale local data. Simply add your domains again — if they're still registered on the platform, they'll link back.
+
+**Q: Is there a banner on other pages?**
+A: Yes, a promotional banner appears on email-related pages (Webmail, Mail Functions, etc.). It can be dismissed by clicking the X button and won't reappear for 7 days.
+
+---
+
+## Support
+
+- **CyberPanel Issues**: https://github.com/usmannasir/cyberpanel/issues
+- **CyberMail Platform**: https://platform.cyberpersons.com
+- **Email Deliverability Help**: Check your domain at https://www.mail-tester.com
diff --git a/emailDelivery/__init__.py b/emailDelivery/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/emailDelivery/apps.py b/emailDelivery/apps.py
new file mode 100644
index 000000000..a8004a8cd
--- /dev/null
+++ b/emailDelivery/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class EmaildeliveryConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'emailDelivery'
diff --git a/emailDelivery/emailDeliveryManager.py b/emailDelivery/emailDeliveryManager.py
new file mode 100644
index 000000000..6967b3a67
--- /dev/null
+++ b/emailDelivery/emailDeliveryManager.py
@@ -0,0 +1,742 @@
+import json
+import requests
+from django.shortcuts import render
+from django.http import JsonResponse
+from loginSystem.models import Administrator
+from plogical.acl import ACLManager
+from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
+from plogical.processUtilities import ProcessUtilities
+from .models import CyberMailAccount, CyberMailDomain
+
+
+class EmailDeliveryManager:
+
+    PLATFORM_URL = 'https://platform.cyberpersons.com/email/cp/'
+
+    def __init__(self):
+        self.logger = logging
+
+    def _apiCall(self, endpoint, data=None, apiKey=None):
+        """POST to platform API. If apiKey provided, sends Bearer auth."""
+        headers = {'Content-Type': 'application/json'}
+        if apiKey:
+            headers['Authorization'] = 'Bearer %s' % apiKey
+        url = self.PLATFORM_URL + endpoint
+        try:
+            resp = requests.post(url, json=data or {}, headers=headers, timeout=30)
+            return resp.json()
+        except requests.exceptions.Timeout:
+            return {'success': False, 'error': 'Platform API request timed out.'}
+        except requests.exceptions.ConnectionError:
+            return {'success': False, 'error': 'Could not connect to CyberMail platform.'}
+        except Exception as e:
+            return {'success': False, 'error': str(e)}
+
+    def _accountApiCall(self, account, endpoint, data=None):
+        """API call using a CyberMailAccount's stored per-user key."""
+        if not account.api_key:
+            return {'success': False, 'error': 'No API key found. Please reconnect your account.'}
+        return self._apiCall(endpoint, data, apiKey=account.api_key)
+
+    def home(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+
+            isConnected = False
+            try:
+                account = CyberMailAccount.objects.get(admin=admin)
+                isConnected = account.is_connected
+            except CyberMailAccount.DoesNotExist:
+                pass
+
+            context = {
+                'isConnected': isConnected,
+                'adminEmail': admin.email,
+                'adminName': admin.firstName if hasattr(admin, 'firstName') else admin.userName,
+            }
+
+            return render(request, 'emailDelivery/index.html', context)
+
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.home] Error: %s' % str(e))
+            return render(request, 'emailDelivery/index.html', {
+                'error': str(e),
+                'isConnected': False,
+                'adminEmail': '',
+                'adminName': '',
+            })
+
+    def getStatus(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            result = self._accountApiCall(account, 'api/account/', {'email': account.email})
+            if not result.get('success', False):
+                return JsonResponse({'success': False, 'error': result.get('error', 'Failed to get account status')})
+
+            accountData = result.get('data', {})
+
+            # Platform returns plan info nested under data.plan
+            planInfo = accountData.get('plan', {})
+            if planInfo.get('name'):
+                account.plan_name = planInfo['name']
+                account.plan_slug = planInfo.get('slug', account.plan_slug)
+                account.emails_per_month = planInfo.get('emails_per_month', account.emails_per_month)
+                account.save()
+
+            # Sync domains from platform to local DB
+            try:
+                domainResult = self._accountApiCall(account, 'api/domains/list/', {'email': account.email})
+                if domainResult.get('success', False):
+                    platformDomains = domainResult.get('data', {}).get('domains', [])
+                    for pd in platformDomains:
+                        try:
+                            cmDomain = CyberMailDomain.objects.get(account=account, domain=pd['domain'])
+                            cmDomain.status = pd.get('status', cmDomain.status)
+                            cmDomain.spf_verified = pd.get('spf_verified', False)
+                            cmDomain.dkim_verified = pd.get('dkim_verified', False)
+                            cmDomain.dmarc_verified = pd.get('dmarc_verified', False)
+                            cmDomain.save()
+                        except CyberMailDomain.DoesNotExist:
+                            CyberMailDomain.objects.create(
+                                account=account,
+                                domain=pd['domain'],
+                                platform_domain_id=pd.get('id'),
+                                status=pd.get('status', 'pending'),
+                                spf_verified=pd.get('spf_verified', False),
+                                dkim_verified=pd.get('dkim_verified', False),
+                                dmarc_verified=pd.get('dmarc_verified', False),
+                            )
+            except Exception as e:
+                self.logger.writeToFile('[EmailDeliveryManager.getStatus] Domain sync error: %s' % str(e))
+
+            domains = list(CyberMailDomain.objects.filter(account=account).values(
+                'id', 'domain', 'platform_domain_id', 'status',
+                'spf_verified', 'dkim_verified', 'dmarc_verified', 'dns_configured'
+            ))
+
+            return JsonResponse({
+                'success': True,
+                'account': {
+                    'email': account.email,
+                    'plan_name': account.plan_name,
+                    'plan_slug': account.plan_slug,
+                    'emails_per_month': account.emails_per_month,
+                    'relay_enabled': account.relay_enabled,
+                    'smtp_host': account.smtp_host,
+                    'smtp_port': account.smtp_port,
+                },
+                'domains': domains,
+                'stats': {
+                    'emails_sent': accountData.get('emails_sent_this_month', 0),
+                    'reputation_score': accountData.get('reputation_score', 0),
+                },
+            })
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.getStatus] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def connect(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            data = json.loads(request.body)
+            password = data.get('password', '')
+            email = data.get('email', admin.email)
+
+            if not password:
+                return JsonResponse({'success': False, 'error': 'Password is required'})
+
+            fullName = admin.firstName if hasattr(admin, 'firstName') and admin.firstName else admin.userName
+
+            # Public endpoint — no API key needed for registration
+            result = self._apiCall('api/register/', {
+                'email': email,
+                'password': password,
+                'full_name': fullName,
+            })
+
+            if not result.get('success', False):
+                return JsonResponse({'success': False, 'error': result.get('error', 'Registration failed')})
+
+            accountData = result.get('data', {})
+            apiKey = accountData.get('api_key', '')
+
+            account, created = CyberMailAccount.objects.get_or_create(
+                admin=admin,
+                defaults={
+                    'email': email,
+                    'api_key': apiKey,
+                    'platform_account_id': accountData.get('account_id'),
+                    'plan_name': accountData.get('plan_name', 'Free'),
+                    'plan_slug': accountData.get('plan_slug', 'free'),
+                    'emails_per_month': accountData.get('emails_per_month', 15000),
+                    'is_connected': True,
+                }
+            )
+
+            if not created:
+                account.email = email
+                account.api_key = apiKey
+                account.platform_account_id = accountData.get('account_id')
+                account.plan_name = accountData.get('plan_name', 'Free')
+                account.plan_slug = accountData.get('plan_slug', 'free')
+                account.emails_per_month = accountData.get('emails_per_month', 15000)
+                account.is_connected = True
+                # Reset relay fields from previous account
+                account.smtp_credential_id = None
+                account.smtp_username = ''
+                account.relay_enabled = False
+                account.save()
+                # Clear stale domains from previous account
+                CyberMailDomain.objects.filter(account=account).delete()
+
+            return JsonResponse({'success': True, 'message': 'Connected to CyberMail successfully'})
+
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.connect] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def addDomain(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+            domainName = data.get('domain', '')
+
+            if not domainName:
+                return JsonResponse({'success': False, 'error': 'Domain name is required'})
+
+            result = self._accountApiCall(account, 'api/domains/add/', {
+                'email': account.email,
+                'domain': domainName,
+            })
+
+            if not result.get('success', False):
+                return JsonResponse({'success': False, 'error': result.get('error', 'Failed to add domain')})
+
+            domainData = result.get('data', {})
+
+            cmDomain, created = CyberMailDomain.objects.get_or_create(
+                account=account,
+                domain=domainName,
+                defaults={
+                    'platform_domain_id': domainData.get('id') or domainData.get('domain_id'),
+                    'status': domainData.get('status', 'pending'),
+                }
+            )
+            if not created:
+                cmDomain.platform_domain_id = domainData.get('id') or domainData.get('domain_id')
+                cmDomain.status = domainData.get('status', 'pending')
+                cmDomain.save()
+
+            # Auto-configure DNS if domain exists in PowerDNS
+            dnsResult = self._autoConfigureDnsForDomain(account, domainName)
+
+            return JsonResponse({
+                'success': True,
+                'message': 'Domain added successfully',
+                'dns_configured': dnsResult.get('success', False),
+                'dns_message': dnsResult.get('message', ''),
+            })
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.addDomain] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def _autoConfigureDnsForDomain(self, account, domainName):
+        try:
+            from dns.models import Domains as dnsDomains
+            from plogical.dnsUtilities import DNS
+
+            try:
+                zone = dnsDomains.objects.get(name=domainName)
+            except dnsDomains.DoesNotExist:
+                return {'success': False, 'message': 'Domain not found in PowerDNS. Please add DNS records manually.'}
+
+            recordsResult = self._accountApiCall(account, 'api/domains/dns-records/', {
+                'email': account.email,
+                'domain': domainName,
+            })
+
+            if not recordsResult.get('success', False):
+                return {'success': False, 'message': 'Could not fetch DNS records from platform.'}
+
+            records = recordsResult.get('data', {}).get('records', [])
+            added = 0
+            for rec in records:
+                try:
+                    # Platform returns 'host' for the DNS hostname, 'type' for record type, 'value' for content
+                    recordHost = rec.get('host', '')
+                    recordType = rec.get('type', '')
+                    recordValue = rec.get('value', '')
+
+                    if not recordHost or not recordType or not recordValue:
+                        continue
+
+                    DNS.createDNSRecord(
+                        zone,
+                        recordHost,
+                        recordType,
+                        recordValue,
+                        rec.get('priority', 0),
+                        rec.get('ttl', 3600)
+                    )
+                    added += 1
+                except Exception as e:
+                    self.logger.writeToFile('[EmailDeliveryManager._autoConfigureDnsForDomain] Record error: %s' % str(e))
+
+            try:
+                cmDomain = CyberMailDomain.objects.get(account=account, domain=domainName)
+                cmDomain.dns_configured = True
+                cmDomain.save()
+            except CyberMailDomain.DoesNotExist:
+                pass
+
+            return {'success': True, 'message': '%d DNS records configured automatically.' % added}
+
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager._autoConfigureDnsForDomain] Error: %s' % str(e))
+            return {'success': False, 'message': str(e)}
+
+    def verifyDomain(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+            domainName = data.get('domain', '')
+
+            result = self._accountApiCall(account, 'api/domains/verify/', {
+                'email': account.email,
+                'domain': domainName,
+            })
+
+            if not result.get('success', False):
+                return JsonResponse({'success': False, 'error': result.get('error', 'Verification failed')})
+
+            verifyData = result.get('data', {})
+
+            # Platform returns: spf, dkim, dmarc, all_verified, verification_token
+            allVerified = verifyData.get('all_verified', False)
+
+            try:
+                cmDomain = CyberMailDomain.objects.get(account=account, domain=domainName)
+                cmDomain.status = 'verified' if allVerified else 'pending'
+                cmDomain.spf_verified = verifyData.get('spf', False)
+                cmDomain.dkim_verified = verifyData.get('dkim', False)
+                cmDomain.dmarc_verified = verifyData.get('dmarc', False)
+                cmDomain.save()
+            except CyberMailDomain.DoesNotExist:
+                pass
+
+            return JsonResponse({'success': True, 'data': {
+                'status': 'verified' if allVerified else 'pending',
+                'spf_verified': verifyData.get('spf', False),
+                'dkim_verified': verifyData.get('dkim', False),
+                'dmarc_verified': verifyData.get('dmarc', False),
+                'all_verified': allVerified,
+            }})
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.verifyDomain] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def listDomains(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            result = self._accountApiCall(account, 'api/domains/list/', {'email': account.email})
+            if not result.get('success', False):
+                return JsonResponse({'success': False, 'error': result.get('error', 'Failed to list domains')})
+
+            platformDomains = result.get('data', {}).get('domains', [])
+
+            for pd in platformDomains:
+                try:
+                    cmDomain = CyberMailDomain.objects.get(account=account, domain=pd['domain'])
+                    cmDomain.status = pd.get('status', cmDomain.status)
+                    cmDomain.spf_verified = pd.get('spf_verified', False)
+                    cmDomain.dkim_verified = pd.get('dkim_verified', False)
+                    cmDomain.dmarc_verified = pd.get('dmarc_verified', False)
+                    cmDomain.save()
+                except CyberMailDomain.DoesNotExist:
+                    CyberMailDomain.objects.create(
+                        account=account,
+                        domain=pd['domain'],
+                        platform_domain_id=pd.get('id'),
+                        status=pd.get('status', 'pending'),
+                        spf_verified=pd.get('spf_verified', False),
+                        dkim_verified=pd.get('dkim_verified', False),
+                        dmarc_verified=pd.get('dmarc_verified', False),
+                    )
+
+            domains = list(CyberMailDomain.objects.filter(account=account).values(
+                'id', 'domain', 'platform_domain_id', 'status',
+                'spf_verified', 'dkim_verified', 'dmarc_verified', 'dns_configured'
+            ))
+
+            return JsonResponse({'success': True, 'domains': domains})
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.listDomains] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def getDnsRecords(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+            domainName = data.get('domain', '')
+
+            result = self._accountApiCall(account, 'api/domains/dns-records/', {
+                'email': account.email,
+                'domain': domainName,
+            })
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.getDnsRecords] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def removeDomain(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+            domainName = data.get('domain', '')
+
+            result = self._accountApiCall(account, 'api/domains/remove/', {
+                'email': account.email,
+                'domain': domainName,
+            })
+
+            if not result.get('success', False):
+                return JsonResponse({'success': False, 'error': result.get('error', 'Failed to remove domain')})
+
+            CyberMailDomain.objects.filter(account=account, domain=domainName).delete()
+
+            return JsonResponse({'success': True, 'message': 'Domain removed successfully'})
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.removeDomain] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def autoConfigureDns(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+            domainName = data.get('domain', '')
+
+            result = self._autoConfigureDnsForDomain(account, domainName)
+
+            return JsonResponse({
+                'success': result.get('success', False),
+                'message': result.get('message', ''),
+            })
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.autoConfigureDns] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def createSmtpCredential(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+
+            result = self._accountApiCall(account, 'api/smtp/create/', {
+                'email': account.email,
+                'description': data.get('description', ''),
+            })
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.createSmtpCredential] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def listSmtpCredentials(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            result = self._accountApiCall(account, 'api/smtp/list/', {'email': account.email})
+
+            # Normalize: platform returns 'id' per credential, JS expects 'credential_id'
+            if result.get('success') and result.get('data', {}).get('credentials'):
+                for cred in result['data']['credentials']:
+                    if 'id' in cred and 'credential_id' not in cred:
+                        cred['credential_id'] = cred['id']
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.listSmtpCredentials] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def rotateSmtpPassword(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+
+            result = self._accountApiCall(account, 'api/smtp/rotate/', {
+                'email': account.email,
+                'credential_id': data.get('credential_id'),
+            })
+
+            # Normalize: platform returns 'new_password', JS expects 'password'
+            if result.get('success') and result.get('data', {}).get('new_password'):
+                result['data']['password'] = result['data'].pop('new_password')
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.rotateSmtpPassword] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def deleteSmtpCredential(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+
+            result = self._accountApiCall(account, 'api/smtp/delete/', {
+                'email': account.email,
+                'credential_id': data.get('credential_id'),
+            })
+
+            if result.get('success', False):
+                if account.smtp_credential_id == data.get('credential_id'):
+                    account.smtp_credential_id = None
+                    account.smtp_username = ''
+                    account.save()
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.deleteSmtpCredential] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def enableRelay(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            # Create SMTP credential if none exists
+            if not account.smtp_credential_id:
+                result = self._accountApiCall(account, 'api/smtp/create/', {
+                    'email': account.email,
+                    'description': 'CyberPanel Relay',
+                })
+                if not result.get('success', False):
+                    return JsonResponse({'success': False, 'error': result.get('error', 'Failed to create SMTP credential')})
+
+                credData = result.get('data', {})
+                account.smtp_credential_id = credData.get('credential_id')
+                account.smtp_username = credData.get('username', '')
+                account.save()
+
+                smtpPassword = credData.get('password', '')
+            else:
+                # Rotate to get a fresh password
+                result = self._accountApiCall(account, 'api/smtp/rotate/', {
+                    'email': account.email,
+                    'credential_id': account.smtp_credential_id,
+                })
+                if not result.get('success', False):
+                    return JsonResponse({'success': False, 'error': result.get('error', 'Failed to get SMTP password')})
+
+                smtpPassword = result.get('data', {}).get('new_password', '')
+
+            # Configure Postfix relay via mailUtilities subprocess
+            execPath = "/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/mailUtilities.py"
+            execPath += " configureRelayHost --smtpHost %s --smtpPort %s --smtpUser '%s' --smtpPassword '%s'" % (
+                account.smtp_host, account.smtp_port, account.smtp_username, smtpPassword
+            )
+            output = ProcessUtilities.outputExecutioner(execPath)
+
+            if output and '1,None' in output:
+                account.relay_enabled = True
+                account.save()
+                return JsonResponse({'success': True, 'message': 'SMTP relay enabled successfully'})
+            else:
+                return JsonResponse({'success': False, 'error': 'Failed to configure Postfix relay: %s' % str(output)})
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.enableRelay] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def disableRelay(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            execPath = "/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/mailUtilities.py removeRelayHost"
+            output = ProcessUtilities.outputExecutioner(execPath)
+
+            if output and '1,None' in output:
+                account.relay_enabled = False
+                account.save()
+                return JsonResponse({'success': True, 'message': 'SMTP relay disabled successfully'})
+            else:
+                return JsonResponse({'success': False, 'error': 'Failed to remove Postfix relay: %s' % str(output)})
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.disableRelay] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def getStats(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            result = self._accountApiCall(account, 'api/stats/', {'email': account.email})
+
+            # Normalize for JS: platform returns data.total_sent etc at top level
+            if result.get('success') and result.get('data'):
+                d = result['data']
+                result['data'] = {
+                    'total_sent': d.get('total_sent', 0),
+                    'delivered': d.get('delivered', 0),
+                    'bounced': d.get('bounced', 0),
+                    'failed': d.get('failed', 0),
+                    'delivery_rate': d.get('delivery_rate', 0),
+                }
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.getStats] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def getDomainStats(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            result = self._accountApiCall(account, 'api/stats/domains/', {'email': account.email})
+
+            # Normalize: platform returns data.domains as dict, JS expects array
+            if result.get('success') and result.get('data'):
+                domainsData = result['data'].get('domains', {})
+                if isinstance(domainsData, dict):
+                    domainsList = []
+                    for domainName, stats in domainsData.items():
+                        entry = {'domain': domainName}
+                        if isinstance(stats, dict):
+                            entry.update(stats)
+                        domainsList.append(entry)
+                    result['data']['domains'] = domainsList
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.getDomainStats] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def getLogs(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+            data = json.loads(request.body)
+
+            result = self._accountApiCall(account, 'api/logs/', {
+                'email': account.email,
+                'page': data.get('page', 1),
+                'per_page': data.get('per_page', 50),
+                'status': data.get('status', ''),
+                'from_domain': data.get('from_domain', ''),
+                'days': data.get('days', 7),
+            })
+
+            # Normalize field names and pagination
+            if result.get('success') and result.get('data'):
+                pagination = result['data'].get('pagination', {})
+                result['data']['total_pages'] = pagination.get('total_pages', 1)
+                result['data']['page'] = pagination.get('page', 1)
+
+                # Map platform field names to what JS/template expects
+                logs = result['data'].get('logs', [])
+                for log in logs:
+                    log['date'] = log.get('queued_at', '')
+                    log['from'] = log.get('from_email', '')
+                    log['to'] = log.get('to_email', '')
+
+            return JsonResponse(result)
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.getLogs] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def disconnect(self, request, userID):
+        try:
+            admin = Administrator.objects.get(pk=userID)
+            account = CyberMailAccount.objects.get(admin=admin, is_connected=True)
+
+            # Disable relay first if enabled
+            if account.relay_enabled:
+                execPath = "/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/mailUtilities.py removeRelayHost"
+                ProcessUtilities.outputExecutioner(execPath)
+
+            account.is_connected = False
+            account.relay_enabled = False
+            account.api_key = ''
+            account.smtp_credential_id = None
+            account.smtp_username = ''
+            account.platform_account_id = None
+            account.save()
+
+            # Remove local domain records
+            CyberMailDomain.objects.filter(account=account).delete()
+
+            return JsonResponse({'success': True, 'message': 'Disconnected from CyberMail'})
+
+        except CyberMailAccount.DoesNotExist:
+            return JsonResponse({'success': False, 'error': 'Account not connected'})
+        except Exception as e:
+            self.logger.writeToFile('[EmailDeliveryManager.disconnect] Error: %s' % str(e))
+            return JsonResponse({'success': False, 'error': str(e)})
+
+    def checkStatus(self, request, userID):
+        try:
+            result = self._apiCall('api/health/', {})
+            return JsonResponse(result)
+        except Exception as e:
+            return JsonResponse({'success': False, 'error': str(e)})
diff --git a/emailDelivery/migrations/__init__.py b/emailDelivery/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/emailDelivery/models.py b/emailDelivery/models.py
new file mode 100644
index 000000000..b1a6cdd5d
--- /dev/null
+++ b/emailDelivery/models.py
@@ -0,0 +1,44 @@
+from django.db import models
+from loginSystem.models import Administrator
+
+
+class CyberMailAccount(models.Model):
+    admin = models.OneToOneField(Administrator, on_delete=models.CASCADE, related_name='cybermail_account')
+    platform_account_id = models.IntegerField(null=True)
+    api_key = models.CharField(max_length=255, blank=True)
+    email = models.CharField(max_length=255)
+    plan_name = models.CharField(max_length=100, default='Free')
+    plan_slug = models.CharField(max_length=50, default='free')
+    emails_per_month = models.IntegerField(default=15000)
+    is_connected = models.BooleanField(default=False)
+    relay_enabled = models.BooleanField(default=False)
+    smtp_credential_id = models.IntegerField(null=True)
+    smtp_username = models.CharField(max_length=255, blank=True)
+    smtp_host = models.CharField(max_length=255, default='mail.cyberpersons.com')
+    smtp_port = models.IntegerField(default=587)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        db_table = 'cybermail_accounts'
+
+    def __str__(self):
+        return f"CyberMail Account for {self.admin.userName}"
+
+
+class CyberMailDomain(models.Model):
+    account = models.ForeignKey(CyberMailAccount, on_delete=models.CASCADE, related_name='domains')
+    domain = models.CharField(max_length=255)
+    platform_domain_id = models.IntegerField(null=True)
+    status = models.CharField(max_length=50, default='pending')
+    spf_verified = models.BooleanField(default=False)
+    dkim_verified = models.BooleanField(default=False)
+    dmarc_verified = models.BooleanField(default=False)
+    dns_configured = models.BooleanField(default=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        db_table = 'cybermail_domains'
+
+    def __str__(self):
+        return f"CyberMail Domain: {self.domain}"
diff --git a/emailDelivery/static/emailDelivery/emailDelivery.js b/emailDelivery/static/emailDelivery/emailDelivery.js
new file mode 100644
index 000000000..14202ad3d
--- /dev/null
+++ b/emailDelivery/static/emailDelivery/emailDelivery.js
@@ -0,0 +1,326 @@
+app.controller('emailDeliveryCtrl', ['$scope', '$http', '$timeout', function($scope, $http, $timeout) {
+
+    function apiCall(url, data, callback, errback) {
+        var config = {headers: {'X-CSRFToken': getCookie('csrftoken')}};
+        $http.post(url, data || {}, config).then(function(resp) {
+            if (callback) callback(resp.data);
+        }, function(err) {
+            console.error('API error:', url, err);
+            if (errback) errback(err);
+        });
+    }
+
+    function notify(msg, type) {
+        new PNotify({title: type === 'error' ? 'Error' : 'Email Delivery', text: msg, type: type || 'success'});
+    }
+
+    $scope.loading = true;
+    $scope.activeTab = 'domains';
+
+    // Account data
+    $scope.account = {};
+    $scope.stats = {};
+    $scope.domains = [];
+    $scope.smtpCredentials = [];
+    $scope.logs = [];
+    $scope.detailedStats = {};
+    $scope.domainStats = [];
+
+    // Form data
+    $scope.connectEmail = '';
+    $scope.connectPassword = '';
+    $scope.connectLoading = false;
+    $scope.newDomainName = '';
+    $scope.addDomainLoading = false;
+    $scope.newSmtpDescription = '';
+    $scope.createSmtpLoading = false;
+    $scope.oneTimePassword = null;
+
+    // Relay
+    $scope.relayLoading = false;
+
+    // Logs
+    $scope.logFilters = {status: '', from_domain: '', days: 7};
+    $scope.logsPage = 1;
+    $scope.logsTotalPages = 1;
+    $scope.logsLoading = false;
+
+    // Domain stats
+    $scope.domainStatsLoading = false;
+
+    // Disconnect
+    $scope.disconnectLoading = false;
+
+    $scope.init = function(isConnected, adminEmail) {
+        $scope.isConnected = isConnected;
+        $scope.connectEmail = adminEmail || '';
+        if (isConnected) {
+            $scope.refreshDashboard();
+        } else {
+            $scope.loading = false;
+        }
+    };
+
+    $scope.refreshDashboard = function() {
+        $scope.loading = true;
+        apiCall('/emailDelivery/status/', {}, function(data) {
+            if (data.success) {
+                $scope.account = data.account;
+                $scope.stats = data.stats || {};
+                $scope.domains = data.domains || [];
+            }
+            $scope.loading = false;
+        }, function() {
+            $scope.loading = false;
+            notify('Failed to load dashboard data', 'error');
+        });
+    };
+
+    $scope.getUsagePercent = function() {
+        if (!$scope.account.emails_per_month) return 0;
+        return Math.min(100, Math.round(($scope.stats.emails_sent || 0) / $scope.account.emails_per_month * 100));
+    };
+
+    // ============ Connect ============
+    $scope.connectAccount = function() {
+        if (!$scope.connectEmail || !$scope.connectPassword) {
+            notify('Please fill in all fields.', 'error');
+            return;
+        }
+        $scope.connectLoading = true;
+        apiCall('/emailDelivery/connect/', {
+            email: $scope.connectEmail,
+            password: $scope.connectPassword
+        }, function(data) {
+            $scope.connectLoading = false;
+            if (data.success) {
+                $('#connectModal').modal('hide');
+                notify('Connected to CyberMail successfully!');
+                $timeout(function() { window.location.reload(); }, 1000);
+            } else {
+                notify(data.error || 'Connection failed.', 'error');
+            }
+        }, function() {
+            $scope.connectLoading = false;
+            notify('Connection failed. Please try again.', 'error');
+        });
+    };
+
+    // ============ Domains ============
+    $scope.addDomain = function() {
+        if (!$scope.newDomainName) {
+            notify('Please enter a domain name.', 'error');
+            return;
+        }
+        $scope.addDomainLoading = true;
+        apiCall('/emailDelivery/domains/add/', {
+            domain: $scope.newDomainName
+        }, function(data) {
+            $scope.addDomainLoading = false;
+            if (data.success) {
+                $('#addDomainModal').modal('hide');
+                $scope.newDomainName = '';
+                $scope.refreshDashboard();
+                var msg = 'Domain added successfully.';
+                if (data.dns_configured) msg += ' ' + data.dns_message;
+                notify(msg);
+            } else {
+                notify(data.error || 'Failed to add domain.', 'error');
+            }
+        }, function() {
+            $scope.addDomainLoading = false;
+            notify('Failed to add domain.', 'error');
+        });
+    };
+
+    $scope.verifyDomain = function(domain) {
+        apiCall('/emailDelivery/domains/verify/', {domain: domain}, function(data) {
+            if (data.success) {
+                $scope.refreshDashboard();
+                notify('Domain verification completed.');
+            } else {
+                notify(data.error || 'Verification failed.', 'error');
+            }
+        });
+    };
+
+    $scope.configureDns = function(domain) {
+        apiCall('/emailDelivery/domains/auto-configure-dns/', {domain: domain}, function(data) {
+            if (data.success) {
+                $scope.refreshDashboard();
+                notify(data.message || 'DNS configured.');
+            } else {
+                notify(data.message || data.error || 'DNS configuration failed.', 'error');
+            }
+        });
+    };
+
+    $scope.removeDomain = function(domain) {
+        if (!confirm('Remove domain ' + domain + ' from CyberMail?')) return;
+        apiCall('/emailDelivery/domains/remove/', {domain: domain}, function(data) {
+            if (data.success) {
+                $scope.refreshDashboard();
+                notify('Domain removed.');
+            } else {
+                notify(data.error || 'Failed to remove domain.', 'error');
+            }
+        });
+    };
+
+    // ============ SMTP Credentials ============
+    $scope.switchTab = function(tab) {
+        $scope.activeTab = tab;
+        if (tab === 'smtp') $scope.loadSmtpCredentials();
+        if (tab === 'logs') $scope.loadLogs();
+        if (tab === 'stats') $scope.loadStats();
+    };
+
+    $scope.loadSmtpCredentials = function() {
+        apiCall('/emailDelivery/smtp/list/', {}, function(data) {
+            if (data.success) {
+                $scope.smtpCredentials = data.data ? data.data.credentials || [] : [];
+            }
+        });
+    };
+
+    $scope.createSmtpCredential = function() {
+        $scope.createSmtpLoading = true;
+        apiCall('/emailDelivery/smtp/create/', {
+            description: $scope.newSmtpDescription
+        }, function(data) {
+            $scope.createSmtpLoading = false;
+            if (data.success) {
+                $('#createSmtpModal').modal('hide');
+                $scope.newSmtpDescription = '';
+                $scope.oneTimePassword = data.data ? data.data.password : null;
+                $scope.loadSmtpCredentials();
+                if ($scope.oneTimePassword) {
+                    $timeout(function() { $('#passwordModal').modal('show'); }, 500);
+                }
+                notify('SMTP credential created.');
+            } else {
+                notify(data.error || 'Failed to create credential.', 'error');
+            }
+        }, function() {
+            $scope.createSmtpLoading = false;
+            notify('Failed to create credential.', 'error');
+        });
+    };
+
+    $scope.rotatePassword = function(credId) {
+        if (!confirm("Rotate this credential's password? The old password will stop working immediately.")) return;
+        apiCall('/emailDelivery/smtp/rotate/', {credential_id: credId}, function(data) {
+            if (data.success) {
+                $scope.oneTimePassword = data.data ? data.data.password : null;
+                if ($scope.oneTimePassword) {
+                    $timeout(function() { $('#passwordModal').modal('show'); }, 300);
+                }
+                notify('Password rotated.');
+            } else {
+                notify(data.error || 'Failed to rotate password.', 'error');
+            }
+        });
+    };
+
+    $scope.deleteCredential = function(credId) {
+        if (!confirm('Delete this SMTP credential? This cannot be undone.')) return;
+        apiCall('/emailDelivery/smtp/delete/', {credential_id: credId}, function(data) {
+            if (data.success) {
+                $scope.loadSmtpCredentials();
+                notify('Credential deleted.');
+            } else {
+                notify(data.error || 'Failed to delete credential.', 'error');
+            }
+        });
+    };
+
+    // ============ Relay ============
+    $scope.enableRelay = function() {
+        $scope.relayLoading = true;
+        apiCall('/emailDelivery/relay/enable/', {}, function(data) {
+            $scope.relayLoading = false;
+            if (data.success) {
+                $scope.account.relay_enabled = true;
+                notify('SMTP relay enabled!');
+            } else {
+                notify(data.error || 'Failed to enable relay.', 'error');
+            }
+        }, function() {
+            $scope.relayLoading = false;
+            notify('Failed to enable relay.', 'error');
+        });
+    };
+
+    $scope.disableRelay = function() {
+        if (!confirm('Disable SMTP relay? Postfix will send directly again.')) return;
+        $scope.relayLoading = true;
+        apiCall('/emailDelivery/relay/disable/', {}, function(data) {
+            $scope.relayLoading = false;
+            if (data.success) {
+                $scope.account.relay_enabled = false;
+                notify('SMTP relay disabled.');
+            } else {
+                notify(data.error || 'Failed to disable relay.', 'error');
+            }
+        }, function() {
+            $scope.relayLoading = false;
+            notify('Failed to disable relay.', 'error');
+        });
+    };
+
+    // ============ Logs ============
+    $scope.loadLogs = function() {
+        $scope.logsLoading = true;
+        apiCall('/emailDelivery/logs/', {
+            page: $scope.logsPage,
+            status: $scope.logFilters.status,
+            from_domain: $scope.logFilters.from_domain,
+            days: $scope.logFilters.days || 7
+        }, function(data) {
+            $scope.logsLoading = false;
+            if (data.success) {
+                $scope.logs = data.data ? data.data.logs || [] : [];
+                $scope.logsTotalPages = data.data ? data.data.total_pages || 1 : 1;
+            }
+        }, function() {
+            $scope.logsLoading = false;
+        });
+    };
+
+    // ============ Stats ============
+    $scope.loadStats = function() {
+        apiCall('/emailDelivery/stats/', {}, function(data) {
+            if (data.success) {
+                $scope.detailedStats = data.data || {};
+            }
+        });
+        $scope.domainStatsLoading = true;
+        apiCall('/emailDelivery/stats/domains/', {}, function(data) {
+            $scope.domainStatsLoading = false;
+            if (data.success) {
+                $scope.domainStats = data.data ? data.data.domains || [] : [];
+            }
+        }, function() {
+            $scope.domainStatsLoading = false;
+        });
+    };
+
+    // ============ Disconnect ============
+    $scope.disconnectAccount = function() {
+        $scope.disconnectLoading = true;
+        apiCall('/emailDelivery/disconnect/', {}, function(data) {
+            $scope.disconnectLoading = false;
+            if (data.success) {
+                $('#disconnectModal').modal('hide');
+                notify('Disconnected from CyberMail.');
+                $timeout(function() { window.location.reload(); }, 1000);
+            } else {
+                notify(data.error || 'Failed to disconnect.', 'error');
+            }
+        }, function() {
+            $scope.disconnectLoading = false;
+            notify('Failed to disconnect.', 'error');
+        });
+    };
+
+}]);
diff --git a/emailDelivery/templates/emailDelivery/index.html b/emailDelivery/templates/emailDelivery/index.html
new file mode 100644
index 000000000..a2244266c
--- /dev/null
+++ b/emailDelivery/templates/emailDelivery/index.html
@@ -0,0 +1,1095 @@
+{% extends "baseTemplate/index.html" %}
+{% load i18n %}
+{% load static %}
+{% block title %}Email Delivery - CyberPanel{% endblock %}
+
+{% block content %}
+
+<style>
+/* ======== Foundation ======== */
+.ed-page { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }
+.ed-page *, .ed-page *::before, .ed-page *::after { box-sizing: border-box; }
+
+/* ======== Marketing Page ======== */
+.ed-hero {
+    background: linear-gradient(135deg, #4f46e5 0%, #7c3aed 50%, #9333ea 100%);
+    border-radius: 16px;
+    padding: 64px 48px;
+    text-align: center;
+    color: #fff;
+    margin-bottom: 40px;
+    position: relative;
+    overflow: hidden;
+}
+.ed-hero::before {
+    content: '';
+    position: absolute;
+    top: -60%; right: -20%;
+    width: 600px; height: 600px;
+    background: radial-gradient(circle, rgba(255,255,255,0.08) 0%, transparent 70%);
+    border-radius: 50%;
+}
+.ed-hero::after {
+    content: '';
+    position: absolute;
+    bottom: -40%; left: -10%;
+    width: 400px; height: 400px;
+    background: radial-gradient(circle, rgba(255,255,255,0.05) 0%, transparent 70%);
+    border-radius: 50%;
+}
+.ed-hero > * { position: relative; z-index: 1; }
+.ed-hero-pill {
+    display: inline-flex; align-items: center; gap: 8px;
+    background: rgba(255,255,255,0.15);
+    backdrop-filter: blur(8px);
+    border: 1px solid rgba(255,255,255,0.2);
+    border-radius: 24px;
+    padding: 8px 20px;
+    font-size: 0.85em; font-weight: 500;
+    margin-bottom: 24px;
+}
+.ed-hero-pill i { font-size: 0.9em; }
+.ed-hero h1 {
+    font-size: 3em; font-weight: 800;
+    letter-spacing: -1px; line-height: 1.1;
+    margin: 0 0 16px;
+}
+.ed-hero p {
+    font-size: 1.15em; opacity: 0.9;
+    max-width: 560px; margin: 0 auto 32px;
+    line-height: 1.6;
+}
+.ed-hero-cta {
+    display: inline-flex; align-items: center; gap: 10px;
+    background: #fff; color: #4f46e5;
+    padding: 14px 36px; border-radius: 10px;
+    font-size: 1.05em; font-weight: 700;
+    text-decoration: none; border: none; cursor: pointer;
+    box-shadow: 0 4px 14px rgba(0,0,0,0.15);
+    transition: transform 0.2s, box-shadow 0.2s;
+}
+.ed-hero-cta:hover { transform: translateY(-2px); box-shadow: 0 6px 20px rgba(0,0,0,0.2); }
+.ed-hero-secondary {
+    display: inline-flex; align-items: center; gap: 6px;
+    color: rgba(255,255,255,0.85); background: none; border: none;
+    font-size: 0.95em; margin-left: 16px; cursor: pointer;
+    text-decoration: none; font-weight: 500;
+}
+.ed-hero-secondary:hover { color: #fff; }
+
+/* Metrics Strip */
+.ed-metrics {
+    display: grid; grid-template-columns: repeat(4, 1fr);
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 14px;
+    margin-bottom: 48px;
+    overflow: hidden;
+}
+.ed-metric {
+    padding: 28px 20px;
+    text-align: center;
+    border-right: 1px solid var(--border-color, #e2e8f0);
+}
+.ed-metric:last-child { border-right: none; }
+.ed-metric-value {
+    font-size: 2em; font-weight: 800;
+    background: linear-gradient(135deg, #4f46e5, #9333ea);
+    -webkit-background-clip: text; -webkit-text-fill-color: transparent;
+    background-clip: text;
+}
+.ed-metric-label {
+    font-size: 0.8em; color: var(--text-muted, #64748b);
+    text-transform: uppercase; letter-spacing: 0.5px;
+    margin-top: 4px; font-weight: 600;
+}
+
+/* Section Headers */
+.ed-section {
+    text-align: center;
+    margin-bottom: 32px;
+}
+.ed-section-tag {
+    display: inline-block;
+    background: #ede9fe; color: #6d28d9;
+    padding: 4px 14px; border-radius: 6px;
+    font-size: 0.75em; font-weight: 700;
+    text-transform: uppercase; letter-spacing: 1px;
+    margin-bottom: 12px;
+}
+.ed-section h2 {
+    font-size: 1.8em; font-weight: 800;
+    letter-spacing: -0.5px; margin: 0 0 8px;
+    color: var(--text-color, #0f172a);
+}
+.ed-section p {
+    color: var(--text-muted, #64748b);
+    font-size: 1em; max-width: 520px; margin: 0 auto;
+}
+
+/* Steps */
+.ed-steps {
+    display: grid; grid-template-columns: repeat(3, 1fr);
+    gap: 24px; margin-bottom: 56px;
+    position: relative;
+}
+.ed-steps::before {
+    content: '';
+    position: absolute; top: 40px;
+    left: calc(16.67% + 24px); right: calc(16.67% + 24px);
+    height: 2px;
+    background: linear-gradient(90deg, #c4b5fd, #a78bfa, #c4b5fd);
+    z-index: 0;
+}
+.ed-step {
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 14px;
+    padding: 32px 24px;
+    text-align: center;
+    position: relative;
+    z-index: 1;
+    transition: transform 0.2s, box-shadow 0.2s;
+}
+.ed-step:hover { transform: translateY(-4px); box-shadow: 0 8px 25px rgba(0,0,0,0.06); }
+.ed-step-num {
+    width: 52px; height: 52px;
+    background: linear-gradient(135deg, #4f46e5, #7c3aed);
+    border-radius: 14px; color: #fff;
+    display: inline-flex; align-items: center; justify-content: center;
+    font-size: 1.3em; font-weight: 800;
+    margin-bottom: 18px;
+    box-shadow: 0 4px 12px rgba(79,70,229,0.3);
+}
+.ed-step h3 { font-size: 1.1em; font-weight: 700; margin: 0 0 8px; color: var(--text-color, #0f172a); }
+.ed-step p { font-size: 0.88em; color: var(--text-muted, #64748b); margin: 0; line-height: 1.5; }
+
+/* Pricing */
+.ed-pricing {
+    display: grid; grid-template-columns: repeat(4, 1fr);
+    gap: 20px; margin-bottom: 56px;
+}
+.ed-price {
+    background: var(--card-bg, #fff);
+    border: 2px solid var(--border-color, #e2e8f0);
+    border-radius: 16px;
+    padding: 32px 24px;
+    text-align: center;
+    transition: transform 0.2s, border-color 0.2s, box-shadow 0.2s;
+    position: relative;
+}
+.ed-price:hover { transform: translateY(-4px); box-shadow: 0 8px 25px rgba(0,0,0,0.06); }
+.ed-price.featured {
+    border-color: #7c3aed;
+    box-shadow: 0 8px 30px rgba(124,58,237,0.15);
+}
+.ed-price.featured::before {
+    content: 'MOST POPULAR';
+    position: absolute; top: 0; left: 50%; transform: translate(-50%, -50%);
+    background: linear-gradient(135deg, #4f46e5, #9333ea);
+    color: #fff; padding: 5px 18px; border-radius: 20px;
+    font-size: 0.65em; font-weight: 700; letter-spacing: 1.5px;
+}
+.ed-price-name { font-size: 0.9em; font-weight: 600; color: var(--text-muted, #64748b); margin-bottom: 12px; text-transform: uppercase; letter-spacing: 0.5px; }
+.ed-price-amount { font-size: 2.8em; font-weight: 800; color: var(--text-color, #0f172a); line-height: 1; }
+.ed-price-amount span { font-size: 0.3em; color: var(--text-muted, #64748b); font-weight: 500; vertical-align: middle; }
+.ed-price-vol { font-size: 0.88em; color: #7c3aed; font-weight: 600; margin: 10px 0 20px; }
+.ed-price-list { list-style: none; padding: 0; margin: 0; text-align: left; }
+.ed-price-list li {
+    padding: 8px 0; font-size: 0.85em;
+    color: var(--text-muted, #475569);
+    display: flex; align-items: center; gap: 8px;
+}
+.ed-price-list li::before {
+    content: '\2713'; color: #10b981; font-weight: 700;
+    width: 18px; height: 18px;
+    background: #d1fae5; border-radius: 50%;
+    display: inline-flex; align-items: center; justify-content: center;
+    font-size: 0.7em; flex-shrink: 0;
+}
+.ed-price-btn {
+    display: block; width: 100%;
+    padding: 10px; border-radius: 8px;
+    font-weight: 600; font-size: 0.88em;
+    text-align: center; margin-top: 20px;
+    border: 2px solid var(--border-color, #e2e8f0);
+    background: transparent; cursor: pointer;
+    color: var(--text-color, #0f172a);
+    transition: all 0.2s; text-decoration: none;
+}
+.ed-price-btn:hover { border-color: #7c3aed; color: #7c3aed; }
+.ed-price.featured .ed-price-btn {
+    background: linear-gradient(135deg, #4f46e5, #9333ea);
+    color: #fff; border-color: transparent;
+}
+.ed-price.featured .ed-price-btn:hover { opacity: 0.9; }
+
+/* Features Grid */
+.ed-features {
+    display: grid; grid-template-columns: repeat(3, 1fr);
+    gap: 20px; margin-bottom: 56px;
+}
+.ed-feat {
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 14px;
+    padding: 28px 24px;
+    transition: transform 0.2s, box-shadow 0.2s;
+}
+.ed-feat:hover { transform: translateY(-3px); box-shadow: 0 6px 20px rgba(0,0,0,0.05); }
+.ed-feat-icon {
+    width: 44px; height: 44px; border-radius: 12px;
+    display: flex; align-items: center; justify-content: center;
+    font-size: 18px; margin-bottom: 16px;
+}
+.ed-feat-icon.purple { background: #ede9fe; color: #7c3aed; }
+.ed-feat-icon.blue { background: #dbeafe; color: #2563eb; }
+.ed-feat-icon.green { background: #d1fae5; color: #059669; }
+.ed-feat-icon.amber { background: #fef3c7; color: #d97706; }
+.ed-feat-icon.rose { background: #fce7f3; color: #db2777; }
+.ed-feat-icon.cyan { background: #cffafe; color: #0891b2; }
+.ed-feat h4 { font-size: 1em; font-weight: 700; margin: 0 0 6px; color: var(--text-color, #0f172a); }
+.ed-feat p { font-size: 0.85em; color: var(--text-muted, #64748b); margin: 0; line-height: 1.5; }
+
+/* Bottom CTA */
+.ed-cta {
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 16px;
+    padding: 48px;
+    text-align: center;
+    margin-bottom: 20px;
+}
+.ed-cta h2 { font-size: 1.6em; font-weight: 800; margin: 0 0 10px; letter-spacing: -0.5px; color: var(--text-color, #0f172a); }
+.ed-cta p { color: var(--text-muted, #64748b); margin: 0 0 24px; }
+
+/* ======== Dashboard ======== */
+.ed-dash-head {
+    display: flex; justify-content: space-between; align-items: flex-start;
+    margin-bottom: 24px; flex-wrap: wrap; gap: 16px;
+}
+.ed-dash-title { font-size: 1.5em; font-weight: 800; margin: 0 0 6px; letter-spacing: -0.5px; color: var(--text-color, #0f172a); }
+.ed-pill {
+    display: inline-flex; align-items: center; gap: 6px;
+    padding: 5px 14px; border-radius: 20px;
+    font-size: 0.78em; font-weight: 600;
+}
+.ed-pill-green { background: #d1fae5; color: #065f46; }
+.ed-pill-gray { background: #f1f5f9; color: #475569; }
+.ed-actions { display: flex; gap: 8px; }
+
+.ed-btn {
+    display: inline-flex; align-items: center; gap: 6px;
+    padding: 8px 18px; border-radius: 8px;
+    font-size: 0.85em; font-weight: 600; cursor: pointer;
+    border: none; transition: all 0.15s; text-decoration: none;
+}
+.ed-btn-primary { background: linear-gradient(135deg, #4f46e5, #7c3aed); color: #fff; }
+.ed-btn-primary:hover { opacity: 0.9; }
+.ed-btn-outline { background: transparent; border: 1px solid var(--border-color, #d1d5db); color: var(--text-color, #374151); }
+.ed-btn-outline:hover { border-color: #7c3aed; color: #7c3aed; }
+.ed-btn-danger { background: #fef2f2; color: #dc2626; border: 1px solid #fecaca; }
+.ed-btn-danger:hover { background: #dc2626; color: #fff; }
+.ed-btn-success { background: #10b981; color: #fff; }
+.ed-btn-success:hover { background: #059669; }
+.ed-btn-sm { padding: 5px 12px; font-size: 0.8em; }
+.ed-btn-ghost { background: #f8fafc; border: 1px solid var(--border-color, #e2e8f0); color: var(--text-muted, #64748b); }
+.ed-btn-ghost:hover { background: #f1f5f9; color: var(--text-color, #1e293b); }
+
+/* Usage Card */
+.ed-usage {
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 14px;
+    padding: 20px 24px;
+    margin-bottom: 24px;
+    display: flex; align-items: center; gap: 24px;
+}
+.ed-usage-info { flex: 1; }
+.ed-usage-label { font-size: 0.8em; font-weight: 600; color: var(--text-muted, #64748b); text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 6px; }
+.ed-usage-nums { font-size: 1.3em; font-weight: 700; color: var(--text-color, #0f172a); }
+.ed-usage-nums span { color: var(--text-muted, #94a3b8); font-weight: 400; }
+.ed-bar-wrap { flex: 2; }
+.ed-bar-track { background: var(--border-color, #e5e7eb); border-radius: 8px; height: 10px; overflow: hidden; }
+.ed-bar-fill { height: 100%; border-radius: 8px; background: linear-gradient(90deg, #4f46e5, #7c3aed); transition: width 0.5s; }
+.ed-bar-pct { font-size: 0.8em; color: var(--text-muted, #64748b); margin-top: 4px; text-align: right; }
+
+/* Upgrade Banner */
+.ed-upgrade {
+    background: linear-gradient(135deg, #4f46e5, #7c3aed, #9333ea);
+    border-radius: 12px; padding: 18px 24px; color: #fff;
+    display: flex; justify-content: space-between; align-items: center;
+    margin-bottom: 24px; flex-wrap: wrap; gap: 12px;
+}
+.ed-upgrade strong { font-size: 0.95em; }
+.ed-upgrade p { margin: 4px 0 0; opacity: 0.85; font-size: 0.85em; }
+.ed-upgrade-btn { background: #fff; color: #4f46e5; padding: 8px 20px; border-radius: 8px; font-weight: 700; font-size: 0.85em; text-decoration: none; flex-shrink: 0; }
+
+/* Tabs */
+.ed-tabs {
+    display: flex; gap: 4px;
+    background: var(--card-bg, #f8fafc);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 12px; padding: 4px;
+    margin-bottom: 24px;
+}
+.ed-tab {
+    padding: 10px 20px; cursor: pointer; font-weight: 600;
+    color: var(--text-muted, #64748b);
+    border-radius: 8px; border: none; background: none;
+    font-size: 0.88em; transition: all 0.15s;
+    flex: 1; text-align: center;
+}
+.ed-tab:hover { color: var(--text-color, #1e293b); background: var(--card-bg, #fff); }
+.ed-tab.active {
+    color: #4f46e5; background: var(--card-bg, #fff);
+    box-shadow: 0 1px 3px rgba(0,0,0,0.08);
+}
+
+/* Card */
+.ed-card {
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 14px;
+    padding: 24px;
+    margin-bottom: 20px;
+}
+.ed-card-head {
+    display: flex; justify-content: space-between; align-items: center;
+    margin-bottom: 20px;
+}
+.ed-card-head h3 { font-size: 1.05em; font-weight: 700; margin: 0; color: var(--text-color, #0f172a); }
+
+/* Table */
+.ed-table { width: 100%; border-collapse: collapse; font-size: 0.88em; }
+.ed-table th {
+    text-align: left; padding: 10px 14px;
+    font-size: 0.75em; font-weight: 700;
+    text-transform: uppercase; letter-spacing: 0.5px;
+    color: var(--text-muted, #64748b);
+    background: var(--bg-secondary, #f8fafc);
+    border-bottom: 1px solid var(--border-color, #e2e8f0);
+}
+.ed-table th:first-child { border-radius: 8px 0 0 0; }
+.ed-table th:last-child { border-radius: 0 8px 0 0; }
+.ed-table td {
+    padding: 12px 14px;
+    border-bottom: 1px solid var(--border-color, #f1f5f9);
+    color: var(--text-color, #334155);
+}
+.ed-table tr:last-child td { border-bottom: none; }
+.ed-table tr:hover td { background: var(--bg-secondary, #f8fafc); }
+
+/* Badges */
+.ed-badge {
+    display: inline-flex; align-items: center; gap: 4px;
+    padding: 3px 10px; border-radius: 6px;
+    font-size: 0.75em; font-weight: 600;
+}
+.ed-badge-ok { background: #d1fae5; color: #065f46; }
+.ed-badge-warn { background: #fef3c7; color: #92400e; }
+.ed-badge-err { background: #fef2f2; color: #991b1b; }
+.ed-badge-info { background: #e0e7ff; color: #3730a3; }
+.ed-badge-muted { background: #f1f5f9; color: #475569; }
+
+/* Relay */
+.ed-relay {
+    display: flex; align-items: center; gap: 16px;
+    padding: 20px; background: var(--bg-secondary, #f8fafc);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 12px; margin-bottom: 16px;
+}
+.ed-relay-dot { width: 12px; height: 12px; border-radius: 50%; flex-shrink: 0; }
+.ed-relay-dot.on { background: #10b981; box-shadow: 0 0 8px rgba(16,185,129,0.4); }
+.ed-relay-dot.off { background: #ef4444; }
+.ed-relay-info { flex: 1; }
+.ed-relay-info strong { font-size: 0.95em; display: block; color: var(--text-color, #0f172a); }
+.ed-relay-info small { font-size: 0.8em; color: var(--text-muted, #64748b); }
+
+/* Stats Cards */
+.ed-stat-grid {
+    display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    gap: 16px; margin-bottom: 24px;
+}
+.ed-stat-box {
+    background: var(--card-bg, #fff);
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 12px; padding: 20px; text-align: center;
+}
+.ed-stat-val { font-size: 1.8em; font-weight: 800; color: var(--text-color, #0f172a); }
+.ed-stat-val.green { color: #10b981; }
+.ed-stat-val.amber { color: #f59e0b; }
+.ed-stat-val.red { color: #ef4444; }
+.ed-stat-val.purple { background: linear-gradient(135deg, #4f46e5, #9333ea); -webkit-background-clip: text; -webkit-text-fill-color: transparent; background-clip: text; }
+.ed-stat-lbl { font-size: 0.75em; font-weight: 600; color: var(--text-muted, #64748b); text-transform: uppercase; letter-spacing: 0.5px; margin-top: 4px; }
+
+/* Filters */
+.ed-filters { display: flex; gap: 10px; margin-bottom: 16px; flex-wrap: wrap; }
+.ed-filters select, .ed-filters input {
+    padding: 8px 14px;
+    border: 1px solid var(--border-color, #e2e8f0);
+    border-radius: 8px; font-size: 0.85em;
+    background: var(--card-bg, #fff);
+    color: var(--text-color, #1e293b);
+}
+
+/* Alert */
+.ed-alert {
+    padding: 14px 18px; border-radius: 10px;
+    margin-bottom: 16px; font-size: 0.88em;
+    display: flex; align-items: flex-start; gap: 10px;
+}
+.ed-alert i { margin-top: 2px; }
+.ed-alert-info { background: #eff6ff; color: #1e40af; border: 1px solid #bfdbfe; }
+.ed-alert-warn { background: #fffbeb; color: #92400e; border: 1px solid #fde68a; }
+
+/* Pagination */
+.ed-pager { display: flex; gap: 6px; justify-content: center; margin-top: 20px; align-items: center; }
+.ed-pager button {
+    padding: 7px 14px; border: 1px solid var(--border-color, #e2e8f0);
+    background: var(--card-bg, #fff); border-radius: 8px;
+    cursor: pointer; font-size: 0.82em; font-weight: 500;
+    transition: all 0.15s;
+}
+.ed-pager button:hover:not(:disabled) { border-color: #7c3aed; color: #7c3aed; }
+.ed-pager button:disabled { opacity: 0.4; cursor: not-allowed; }
+.ed-pager-info { font-size: 0.82em; color: var(--text-muted, #64748b); padding: 0 8px; }
+
+/* Password */
+.ed-pw-box {
+    background: #1e1b4b; color: #a78bfa;
+    padding: 14px 18px; border-radius: 10px;
+    font-family: 'SF Mono', 'Fira Code', monospace;
+    font-size: 1.05em; text-align: center;
+    margin: 14px 0; user-select: all;
+    letter-spacing: 1px;
+}
+
+/* Spinner */
+.ed-spin {
+    display: inline-block; width: 20px; height: 20px;
+    border: 3px solid rgba(79,70,229,0.2); border-radius: 50%;
+    border-top-color: #7c3aed;
+    animation: edSpin 0.7s linear infinite;
+}
+@keyframes edSpin { to { transform: rotate(360deg); } }
+
+/* Responsive */
+@media (max-width: 900px) {
+    .ed-hero { padding: 40px 24px; }
+    .ed-hero h1 { font-size: 2em; }
+    .ed-metrics { grid-template-columns: repeat(2, 1fr); }
+    .ed-steps { grid-template-columns: 1fr; }
+    .ed-steps::before { display: none; }
+    .ed-pricing { grid-template-columns: repeat(2, 1fr); }
+    .ed-features { grid-template-columns: 1fr 1fr; }
+    .ed-usage { flex-direction: column; gap: 12px; }
+}
+@media (max-width: 600px) {
+    .ed-pricing { grid-template-columns: 1fr; }
+    .ed-features { grid-template-columns: 1fr; }
+    .ed-metrics { grid-template-columns: 1fr 1fr; }
+    .ed-tabs { overflow-x: auto; }
+}
+</style>
+
+<div class="ed-page" ng-controller="emailDeliveryCtrl" ng-init="init({{ isConnected|yesno:'true,false' }}, '{{ adminEmail|escapejs }}')">
+
+{% if not isConnected %}
+<!-- ========== MARKETING LANDING ========== -->
+
+<!-- Hero -->
+<div class="ed-hero">
+    <div class="ed-hero-pill"><i class="fas fa-bolt"></i> Free 15,000 Emails Every Month</div>
+    <h1>Stop Landing<br>in Spam</h1>
+    <p>Route your emails through dedicated infrastructure with automatic DNS setup, real-time analytics, and 98%+ inbox delivery rates.</p>
+    <button class="ed-hero-cta" data-toggle="modal" data-target="#connectModal">
+        Get Started Free <i class="fas fa-arrow-right"></i>
+    </button>
+</div>
+
+<!-- Metrics -->
+<div class="ed-metrics">
+    <div class="ed-metric"><div class="ed-metric-value">4</div><div class="ed-metric-label">Delivery Nodes</div></div>
+    <div class="ed-metric"><div class="ed-metric-value">99.9%</div><div class="ed-metric-label">Uptime SLA</div></div>
+    <div class="ed-metric"><div class="ed-metric-value">15K</div><div class="ed-metric-label">Free Emails/Mo</div></div>
+    <div class="ed-metric"><div class="ed-metric-value">98%+</div><div class="ed-metric-label">Inbox Rate</div></div>
+</div>
+
+<!-- How It Works -->
+<div class="ed-section">
+    <div class="ed-section-tag">How It Works</div>
+    <h2>Up and Running in Minutes</h2>
+    <p>Three simple steps to professional email delivery</p>
+</div>
+<div class="ed-steps">
+    <div class="ed-step">
+        <div class="ed-step-num">1</div>
+        <h3>Connect Account</h3>
+        <p>Create your free CyberMail account with one click. No credit card required.</p>
+    </div>
+    <div class="ed-step">
+        <div class="ed-step-num">2</div>
+        <h3>Add Your Domains</h3>
+        <p>Select domains and we auto-configure SPF, DKIM, and DMARC records via PowerDNS.</p>
+    </div>
+    <div class="ed-step">
+        <div class="ed-step-num">3</div>
+        <h3>Start Sending</h3>
+        <p>Enable SMTP relay with one click. All outgoing mail routes through our optimized servers.</p>
+    </div>
+</div>
+
+<!-- Pricing -->
+<div class="ed-section">
+    <div class="ed-section-tag">Pricing</div>
+    <h2>Simple, Transparent Plans</h2>
+    <p>Start free, upgrade when you need more</p>
+</div>
+<div class="ed-pricing">
+    <div class="ed-price">
+        <div class="ed-price-name">Free</div>
+        <div class="ed-price-amount">$0<span>/mo</span></div>
+        <div class="ed-price-vol">15,000 emails/month</div>
+        <ul class="ed-price-list">
+            <li>Auto DNS Configuration</li>
+            <li>Real-time Analytics</li>
+            <li>SMTP Relay</li>
+            <li>Community Support</li>
+        </ul>
+        <button class="ed-price-btn" data-toggle="modal" data-target="#connectModal">Get Started</button>
+    </div>
+    <div class="ed-price">
+        <div class="ed-price-name">Starter</div>
+        <div class="ed-price-amount">$15<span>/mo</span></div>
+        <div class="ed-price-vol">100,000 emails/month</div>
+        <ul class="ed-price-list">
+            <li>Everything in Free</li>
+            <li>Priority Delivery</li>
+            <li>Advanced Analytics</li>
+            <li>Email Support</li>
+        </ul>
+        <button class="ed-price-btn" data-toggle="modal" data-target="#connectModal">Get Started</button>
+    </div>
+    <div class="ed-price featured">
+        <div class="ed-price-name">Professional</div>
+        <div class="ed-price-amount">$90<span>/mo</span></div>
+        <div class="ed-price-vol">500,000 emails/month</div>
+        <ul class="ed-price-list">
+            <li>Everything in Starter</li>
+            <li>Dedicated IP Pool</li>
+            <li>Webhook Notifications</li>
+            <li>Priority Support</li>
+        </ul>
+        <button class="ed-price-btn" data-toggle="modal" data-target="#connectModal">Get Started</button>
+    </div>
+    <div class="ed-price">
+        <div class="ed-price-name">Enterprise</div>
+        <div class="ed-price-amount">$299<span>/mo</span></div>
+        <div class="ed-price-vol">2,000,000 emails/month</div>
+        <ul class="ed-price-list">
+            <li>Everything in Pro</li>
+            <li>Dedicated Infrastructure</li>
+            <li>Custom DKIM Signing</li>
+            <li>24/7 Phone Support</li>
+        </ul>
+        <button class="ed-price-btn" data-toggle="modal" data-target="#connectModal">Get Started</button>
+    </div>
+</div>
+
+<!-- Features -->
+<div class="ed-section">
+    <div class="ed-section-tag">Features</div>
+    <h2>Built for Deliverability</h2>
+    <p>Everything you need for reliable email delivery</p>
+</div>
+<div class="ed-features">
+    <div class="ed-feat">
+        <div class="ed-feat-icon purple"><i class="fas fa-server"></i></div>
+        <h4>Dedicated Infrastructure</h4>
+        <p>Custom-built email servers optimized for maximum inbox placement rates.</p>
+    </div>
+    <div class="ed-feat">
+        <div class="ed-feat-icon blue"><i class="fas fa-wand-magic-sparkles"></i></div>
+        <h4>Auto DNS Setup</h4>
+        <p>One-click SPF, DKIM, and DMARC configuration through PowerDNS integration.</p>
+    </div>
+    <div class="ed-feat">
+        <div class="ed-feat-icon green"><i class="fas fa-chart-line"></i></div>
+        <h4>Real-time Analytics</h4>
+        <p>Track delivery rates, bounces, opens, and engagement metrics live.</p>
+    </div>
+    <div class="ed-feat">
+        <div class="ed-feat-icon amber"><i class="fas fa-globe"></i></div>
+        <h4>Multi-Region Delivery</h4>
+        <p>Send from US and EU regions for optimal delivery speeds worldwide.</p>
+    </div>
+    <div class="ed-feat">
+        <div class="ed-feat-icon rose"><i class="fas fa-shield-halved"></i></div>
+        <h4>Reputation Management</h4>
+        <p>Automatic IP warm-up and monitoring to protect your sender score.</p>
+    </div>
+    <div class="ed-feat">
+        <div class="ed-feat-icon cyan"><i class="fas fa-plug"></i></div>
+        <h4>One-Click Relay</h4>
+        <p>Configure Postfix SMTP relay instantly. No code changes needed.</p>
+    </div>
+</div>
+
+<!-- Bottom CTA -->
+<div class="ed-cta">
+    <h2>Ready to improve your deliverability?</h2>
+    <p>Join thousands of CyberPanel users sending emails with confidence.</p>
+    <button class="ed-hero-cta" style="font-size:0.95em;" data-toggle="modal" data-target="#connectModal">
+        Get Started Free <i class="fas fa-arrow-right"></i>
+    </button>
+    <div style="margin-top:20px; display:flex; gap:24px; justify-content:center; flex-wrap:wrap;">
+        <a href="https://cyberpanel.net/KnowledgeBase/cybermail-setup-guide/" target="_blank" style="color:#4f46e5; font-size:0.88em; font-weight:600; text-decoration:none;">
+            <i class="fas fa-book"></i> Setup Guide
+        </a>
+        <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:#4f46e5; font-size:0.88em; font-weight:600; text-decoration:none;">
+            <i class="fas fa-circle-question"></i> User Guide
+        </a>
+    </div>
+</div>
+
+{% endif %}
+
+{% if isConnected %}
+<!-- ========== DASHBOARD ========== -->
+
+<!-- Loading -->
+<div ng-show="loading" style="text-align:center; padding:80px 0;">
+    <div class="ed-spin" style="width:36px;height:36px;border-width:4px;"></div>
+    <p style="margin-top:16px; color:var(--text-muted, #64748b); font-size:0.9em;">Loading dashboard...</p>
+</div>
+
+<div ng-show="!loading">
+
+    <!-- Header -->
+    <div class="ed-dash-head">
+        <div>
+            <div class="ed-dash-title">Email Delivery</div>
+            <div style="display:flex; gap:8px; align-items:center; margin-top:4px;">
+                <span class="ed-pill ed-pill-green"><i class="fas fa-circle" style="font-size:6px;"></i> Connected</span>
+                <span class="ed-pill ed-pill-gray">{$ account.plan_name $} Plan</span>
+            </div>
+        </div>
+        <div class="ed-actions">
+            <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" class="ed-btn ed-btn-outline" style="text-decoration:none;"><i class="fas fa-book"></i> Docs</a>
+            <button class="ed-btn ed-btn-outline" ng-click="refreshDashboard()"><i class="fas fa-arrows-rotate"></i> Refresh</button>
+            <button class="ed-btn ed-btn-ghost" data-toggle="modal" data-target="#disconnectModal">Disconnect</button>
+        </div>
+    </div>
+
+    <!-- Usage -->
+    <div class="ed-usage" ng-show="stats.emails_sent !== undefined">
+        <div class="ed-usage-info">
+            <div class="ed-usage-label">Monthly Usage</div>
+            <div class="ed-usage-nums">{$ stats.emails_sent || 0 $} <span>/ {$ account.emails_per_month $}</span></div>
+        </div>
+        <div class="ed-bar-wrap">
+            <div class="ed-bar-track">
+                <div class="ed-bar-fill" ng-style="{'width': getUsagePercent() + '%'}"></div>
+            </div>
+            <div class="ed-bar-pct">{$ getUsagePercent() $}% used</div>
+        </div>
+    </div>
+
+    <!-- Upgrade Banner -->
+    <div class="ed-upgrade" ng-show="getUsagePercent() > 80 && account.plan_slug === 'free'">
+        <div>
+            <strong>Approaching your plan limit</strong>
+            <p>Upgrade to Starter for 100K emails/month at just $15/mo</p>
+        </div>
+        <a href="https://platform.cyberpersons.com/email/cp/pricing/" target="_blank" class="ed-upgrade-btn">Upgrade Plan</a>
+    </div>
+
+    <!-- Tabs -->
+    <div class="ed-tabs">
+        <button class="ed-tab" ng-class="{'active': activeTab === 'domains'}" ng-click="switchTab('domains')"><i class="fas fa-globe"></i>&nbsp; Domains</button>
+        <button class="ed-tab" ng-class="{'active': activeTab === 'smtp'}" ng-click="switchTab('smtp')"><i class="fas fa-key"></i>&nbsp; SMTP</button>
+        <button class="ed-tab" ng-class="{'active': activeTab === 'relay'}" ng-click="switchTab('relay')"><i class="fas fa-route"></i>&nbsp; Relay</button>
+        <button class="ed-tab" ng-class="{'active': activeTab === 'logs'}" ng-click="switchTab('logs')"><i class="fas fa-list"></i>&nbsp; Logs</button>
+        <button class="ed-tab" ng-class="{'active': activeTab === 'stats'}" ng-click="switchTab('stats')"><i class="fas fa-chart-bar"></i>&nbsp; Stats</button>
+    </div>
+
+    <!-- DOMAINS -->
+    <div ng-show="activeTab === 'domains'">
+        <div class="ed-card">
+            <div class="ed-card-head">
+                <h3>Sending Domains</h3>
+                <button class="ed-btn ed-btn-primary ed-btn-sm" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus"></i> Add Domain</button>
+            </div>
+            <div class="ed-alert ed-alert-info" ng-show="domains.length === 0">
+                <i class="fas fa-info-circle"></i>
+                <span>No domains added yet. Add a domain to start sending emails through CyberMail.</span>
+            </div>
+            <table class="ed-table" ng-show="domains.length > 0">
+                <thead><tr><th>Domain</th><th>Status</th><th>SPF</th><th>DKIM</th><th>DMARC</th><th>DNS</th><th style="text-align:right;">Actions</th></tr></thead>
+                <tbody>
+                    <tr ng-repeat="d in domains">
+                        <td><strong>{$ d.domain $}</strong></td>
+                        <td><span class="ed-badge" ng-class="d.status === 'verified' ? 'ed-badge-ok' : 'ed-badge-warn'">{$ d.status $}</span></td>
+                        <td><span class="ed-badge" ng-class="d.spf_verified ? 'ed-badge-ok' : 'ed-badge-err'">{$ d.spf_verified ? 'OK' : 'Missing' $}</span></td>
+                        <td><span class="ed-badge" ng-class="d.dkim_verified ? 'ed-badge-ok' : 'ed-badge-err'">{$ d.dkim_verified ? 'OK' : 'Missing' $}</span></td>
+                        <td><span class="ed-badge" ng-class="d.dmarc_verified ? 'ed-badge-ok' : 'ed-badge-err'">{$ d.dmarc_verified ? 'OK' : 'Missing' $}</span></td>
+                        <td><span class="ed-badge" ng-class="d.dns_configured ? 'ed-badge-ok' : 'ed-badge-info'">{$ d.dns_configured ? 'Auto' : 'Manual' $}</span></td>
+                        <td style="text-align:right; white-space:nowrap;">
+                            <button class="ed-btn ed-btn-outline ed-btn-sm" ng-click="verifyDomain(d.domain)" title="Verify"><i class="fas fa-check"></i></button>
+                            <button class="ed-btn ed-btn-outline ed-btn-sm" ng-click="configureDns(d.domain)" ng-show="!d.dns_configured" title="Auto DNS"><i class="fas fa-wand-magic-sparkles"></i></button>
+                            <button class="ed-btn ed-btn-danger ed-btn-sm" ng-click="removeDomain(d.domain)" title="Remove"><i class="fas fa-trash"></i></button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <!-- SMTP -->
+    <div ng-show="activeTab === 'smtp'">
+        <div class="ed-card">
+            <div class="ed-card-head">
+                <h3>SMTP Credentials</h3>
+                <button class="ed-btn ed-btn-primary ed-btn-sm" data-toggle="modal" data-target="#createSmtpModal"><i class="fas fa-plus"></i> Create Credential</button>
+            </div>
+            <div class="ed-alert ed-alert-info" ng-show="smtpCredentials.length === 0">
+                <i class="fas fa-info-circle"></i>
+                <span>No SMTP credentials yet. Create one to use for relay or external applications.</span>
+            </div>
+            <table class="ed-table" ng-show="smtpCredentials.length > 0">
+                <thead><tr><th>Username</th><th>Description</th><th>Created</th><th style="text-align:right;">Actions</th></tr></thead>
+                <tbody>
+                    <tr ng-repeat="cred in smtpCredentials">
+                        <td><code style="background:#f1f5f9;padding:3px 8px;border-radius:4px;font-size:0.9em;">{$ cred.username $}</code></td>
+                        <td>{$ cred.description $}</td>
+                        <td style="white-space:nowrap;">{$ cred.created_at $}</td>
+                        <td style="text-align:right; white-space:nowrap;">
+                            <button class="ed-btn ed-btn-outline ed-btn-sm" ng-click="rotatePassword(cred.credential_id)"><i class="fas fa-arrows-rotate"></i> Rotate</button>
+                            <button class="ed-btn ed-btn-danger ed-btn-sm" ng-click="deleteCredential(cred.credential_id)"><i class="fas fa-trash"></i></button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <!-- RELAY -->
+    <div ng-show="activeTab === 'relay'">
+        <div class="ed-card">
+            <div class="ed-card-head">
+                <h3>SMTP Relay Configuration</h3>
+            </div>
+            <p style="color:var(--text-muted, #64748b); font-size:0.88em; margin-bottom:20px;">
+                Route all outgoing Postfix mail through CyberMail's optimized delivery infrastructure.
+            </p>
+            <div class="ed-relay">
+                <div class="ed-relay-dot" ng-class="account.relay_enabled ? 'on' : 'off'"></div>
+                <div class="ed-relay-info">
+                    <strong>{$ account.relay_enabled ? 'Relay Active' : 'Relay Disabled' $}</strong>
+                    <small ng-show="account.relay_enabled">Routing via {$ account.smtp_host $}:{$ account.smtp_port $}</small>
+                    <small ng-show="!account.relay_enabled">Postfix is sending directly</small>
+                </div>
+                <button class="ed-btn ed-btn-success" ng-show="!account.relay_enabled" ng-click="enableRelay()" ng-disabled="relayLoading">
+                    <span ng-hide="relayLoading"><i class="fas fa-power-off"></i> Enable Relay</span>
+                    <span ng-show="relayLoading"><span class="ed-spin"></span></span>
+                </button>
+                <button class="ed-btn ed-btn-danger" ng-show="account.relay_enabled" ng-click="disableRelay()" ng-disabled="relayLoading">
+                    <span ng-hide="relayLoading"><i class="fas fa-power-off"></i> Disable Relay</span>
+                    <span ng-show="relayLoading"><span class="ed-spin"></span></span>
+                </button>
+            </div>
+            <div class="ed-alert ed-alert-info">
+                <i class="fas fa-circle-info"></i>
+                <span><strong>How it works:</strong> Enabling relay configures Postfix to send all outbound mail through CyberMail. An SMTP credential is created automatically.</span>
+            </div>
+        </div>
+    </div>
+
+    <!-- LOGS -->
+    <div ng-show="activeTab === 'logs'">
+        <div class="ed-card">
+            <div class="ed-card-head">
+                <h3>Delivery Logs</h3>
+            </div>
+            <div class="ed-filters">
+                <select ng-model="logFilters.status" ng-change="loadLogs()">
+                    <option value="">All Statuses</option>
+                    <option value="delivered">Delivered</option>
+                    <option value="bounced">Bounced</option>
+                    <option value="failed">Failed</option>
+                    <option value="deferred">Deferred</option>
+                </select>
+                <select ng-model="logFilters.days" ng-change="loadLogs()">
+                    <option value="1">Last 24 Hours</option>
+                    <option value="3">Last 3 Days</option>
+                    <option value="7" selected>Last 7 Days</option>
+                    <option value="14">Last 14 Days</option>
+                    <option value="30">Last 30 Days</option>
+                </select>
+            </div>
+            <div ng-show="logsLoading" style="text-align:center; padding:30px;"><div class="ed-spin" style="width:28px;height:28px;"></div></div>
+            <div class="ed-alert ed-alert-info" ng-show="logs.length === 0 && !logsLoading">
+                <i class="fas fa-inbox"></i> <span>No delivery logs found for this period.</span>
+            </div>
+            <table class="ed-table" ng-show="logs.length > 0">
+                <thead><tr><th>Date</th><th>From</th><th>To</th><th>Subject</th><th>Status</th></tr></thead>
+                <tbody>
+                    <tr ng-repeat="log in logs">
+                        <td style="white-space:nowrap; font-size:0.85em;">{$ log.date | limitTo:19 $}</td>
+                        <td style="max-width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">{$ log.from $}</td>
+                        <td style="max-width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">{$ log.to $}</td>
+                        <td style="max-width:220px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">{$ log.subject $}</td>
+                        <td>
+                            <span class="ed-badge" ng-class="{'ed-badge-ok': log.status==='delivered', 'ed-badge-err': log.status==='failed'||log.status==='bounced', 'ed-badge-warn': log.status==='deferred', 'ed-badge-info': log.status!=='delivered'&&log.status!=='failed'&&log.status!=='bounced'&&log.status!=='deferred'}">{$ log.status $}</span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <div class="ed-pager" ng-show="logsTotalPages > 1">
+                <button ng-disabled="logsPage <= 1" ng-click="logsPage = logsPage - 1; loadLogs();"><i class="fas fa-chevron-left"></i> Prev</button>
+                <span class="ed-pager-info">Page {$ logsPage $} of {$ logsTotalPages $}</span>
+                <button ng-disabled="logsPage >= logsTotalPages" ng-click="logsPage = logsPage + 1; loadLogs();">Next <i class="fas fa-chevron-right"></i></button>
+            </div>
+        </div>
+    </div>
+
+    <!-- STATS -->
+    <div ng-show="activeTab === 'stats'">
+        <div class="ed-stat-grid">
+            <div class="ed-stat-box"><div class="ed-stat-val purple">{$ detailedStats.total_sent || 0 $}</div><div class="ed-stat-lbl">Total Sent</div></div>
+            <div class="ed-stat-box"><div class="ed-stat-val green">{$ detailedStats.delivered || 0 $}</div><div class="ed-stat-lbl">Delivered</div></div>
+            <div class="ed-stat-box"><div class="ed-stat-val amber">{$ detailedStats.bounced || 0 $}</div><div class="ed-stat-lbl">Bounced</div></div>
+            <div class="ed-stat-box"><div class="ed-stat-val red">{$ detailedStats.failed || 0 $}</div><div class="ed-stat-lbl">Failed</div></div>
+            <div class="ed-stat-box"><div class="ed-stat-val purple">{$ (detailedStats.delivery_rate || 0) + '%' $}</div><div class="ed-stat-lbl">Delivery Rate</div></div>
+        </div>
+        <div class="ed-card">
+            <div class="ed-card-head"><h3>Per-Domain Breakdown</h3></div>
+            <div ng-show="domainStatsLoading" style="text-align:center; padding:20px;"><div class="ed-spin"></div></div>
+            <table class="ed-table" ng-show="domainStats.length > 0">
+                <thead><tr><th>Domain</th><th>Sent</th><th>Delivered</th><th>Bounced</th><th>Failed</th><th>Rate</th></tr></thead>
+                <tbody>
+                    <tr ng-repeat="ds in domainStats">
+                        <td><strong>{$ ds.domain $}</strong></td>
+                        <td>{$ ds.sent $}</td><td>{$ ds.delivered $}</td><td>{$ ds.bounced $}</td><td>{$ ds.failed $}</td>
+                        <td><span class="ed-badge ed-badge-ok">{$ ds.delivery_rate $}%</span></td>
+                    </tr>
+                </tbody>
+            </table>
+            <div class="ed-alert ed-alert-info" ng-show="domainStats.length === 0 && !domainStatsLoading">
+                <i class="fas fa-chart-bar"></i> <span>No domain stats available yet. Send some emails first.</span>
+            </div>
+        </div>
+    </div>
+
+</div><!-- end ng-show !loading -->
+{% endif %}
+
+</div><!-- end ng-controller -->
+
+<!-- Connect Modal -->
+<div class="modal fade" id="connectModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><i class="fas fa-plug" style="color:#7c3aed;"></i> Connect to CyberMail</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <p style="color:#64748b; font-size:0.9em; margin-bottom:18px;">Create your CyberMail account or connect an existing one.</p>
+                <div class="form-group">
+                    <label style="font-weight:600; font-size:0.88em;">Email Address</label>
+                    <input type="email" class="form-control" id="cmConnectEmail" value="{{ adminEmail }}" placeholder="you@example.com">
+                </div>
+                <div class="form-group">
+                    <label style="font-weight:600; font-size:0.88em;">Password</label>
+                    <input type="password" class="form-control" id="cmConnectPassword" placeholder="Choose a password for your CyberMail account">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary" id="cmConnectBtn" onclick="cmConnect()" style="background:linear-gradient(135deg,#4f46e5,#7c3aed); border:none;">Connect Account</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Add Domain Modal -->
+<div class="modal fade" id="addDomainModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><i class="fas fa-globe" style="color:#7c3aed;"></i> Add Sending Domain</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <p style="font-size:0.9em; color:#64748b; margin-bottom:18px;">Enter the domain you want to send emails from.</p>
+                <div class="form-group">
+                    <label style="font-weight:600; font-size:0.88em;">Domain Name</label>
+                    <input type="text" class="form-control" id="cmDomainName" placeholder="example.com">
+                </div>
+                <div class="ed-alert ed-alert-info" style="margin-bottom:0;">
+                    <i class="fas fa-wand-magic-sparkles"></i>
+                    <span>If this domain exists in CyberPanel's DNS, SPF, DKIM, and DMARC records will be configured automatically.</span>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary" id="cmAddDomainBtn" onclick="cmAddDomain()" style="background:linear-gradient(135deg,#4f46e5,#7c3aed); border:none;">Add Domain</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Create SMTP Modal -->
+<div class="modal fade" id="createSmtpModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><i class="fas fa-key" style="color:#7c3aed;"></i> Create SMTP Credential</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <p style="font-size:0.9em; color:#64748b; margin-bottom:18px;">Create a new SMTP credential for sending emails.</p>
+                <div class="form-group">
+                    <label style="font-weight:600; font-size:0.88em;">Description (optional)</label>
+                    <input type="text" class="form-control" id="cmSmtpDesc" placeholder="e.g., WordPress mailer, Production relay">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary" id="cmCreateSmtpBtn" onclick="cmCreateSmtp()" style="background:linear-gradient(135deg,#4f46e5,#7c3aed); border:none;">Create Credential</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Password Display Modal -->
+<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><i class="fas fa-lock" style="color:#f59e0b;"></i> Save Your Password</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <div class="ed-alert ed-alert-warn">
+                    <i class="fas fa-triangle-exclamation"></i>
+                    <span><strong>Copy this password now!</strong> It will not be shown again.</span>
+                </div>
+                <div class="ed-pw-box" id="cmPasswordDisplay"></div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">I've Saved It</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Disconnect Modal -->
+<div class="modal fade" id="disconnectModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><i class="fas fa-unlink" style="color:#ef4444;"></i> Disconnect CyberMail</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <p>Are you sure you want to disconnect? This will disable the SMTP relay if active. Your platform account and data will be preserved.</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-danger" id="cmDisconnectBtn" onclick="cmDisconnect()">Disconnect</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+function cmApiPost(url, data, callback) {
+    $.ajax({
+        url: url, type: 'POST',
+        contentType: 'application/json',
+        data: JSON.stringify(data || {}),
+        headers: {'X-CSRFToken': getCookie('csrftoken')},
+        success: function(resp) { callback(resp); },
+        error: function() { callback({success: false, error: 'Request failed'}); }
+    });
+}
+
+function cmConnect() {
+    var email = $('#cmConnectEmail').val();
+    var password = $('#cmConnectPassword').val();
+    if (!email || !password) { new PNotify({title: 'Error', text: 'Please fill in all fields.', type: 'error'}); return; }
+    $('#cmConnectBtn').prop('disabled', true).text('Connecting...');
+    cmApiPost('/emailDelivery/connect/', {email: email, password: password}, function(data) {
+        $('#cmConnectBtn').prop('disabled', false).text('Connect Account');
+        if (data.success) {
+            $('#connectModal').modal('hide');
+            new PNotify({title: 'Success', text: 'Connected to CyberMail!', type: 'success'});
+            setTimeout(function() { window.location.reload(); }, 1000);
+        } else {
+            new PNotify({title: 'Error', text: data.error || 'Connection failed.', type: 'error'});
+        }
+    });
+}
+
+function cmAddDomain() {
+    var domain = $('#cmDomainName').val();
+    if (!domain) { new PNotify({title: 'Error', text: 'Please enter a domain name.', type: 'error'}); return; }
+    $('#cmAddDomainBtn').prop('disabled', true).text('Adding...');
+    cmApiPost('/emailDelivery/domains/add/', {domain: domain}, function(data) {
+        $('#cmAddDomainBtn').prop('disabled', false).text('Add Domain');
+        if (data.success) {
+            $('#addDomainModal').modal('hide');
+            $('#cmDomainName').val('');
+            var msg = 'Domain added successfully.';
+            if (data.dns_configured) msg += ' ' + data.dns_message;
+            new PNotify({title: 'Success', text: msg, type: 'success'});
+            var scope = angular.element(document.querySelector('[ng-controller="emailDeliveryCtrl"]')).scope();
+            scope.$apply(function() { scope.refreshDashboard(); });
+        } else {
+            new PNotify({title: 'Error', text: data.error || 'Failed to add domain.', type: 'error'});
+        }
+    });
+}
+
+function cmCreateSmtp() {
+    var desc = $('#cmSmtpDesc').val();
+    $('#cmCreateSmtpBtn').prop('disabled', true).text('Creating...');
+    cmApiPost('/emailDelivery/smtp/create/', {description: desc}, function(data) {
+        $('#cmCreateSmtpBtn').prop('disabled', false).text('Create Credential');
+        if (data.success) {
+            $('#createSmtpModal').modal('hide');
+            $('#cmSmtpDesc').val('');
+            if (data.data && data.data.password) {
+                $('#cmPasswordDisplay').text(data.data.password);
+                $('#passwordModal').modal('show');
+            }
+            new PNotify({title: 'Success', text: 'SMTP credential created.', type: 'success'});
+            var scope = angular.element(document.querySelector('[ng-controller="emailDeliveryCtrl"]')).scope();
+            scope.$apply(function() { scope.loadSmtpCredentials(); });
+        } else {
+            new PNotify({title: 'Error', text: data.error || 'Failed to create credential.', type: 'error'});
+        }
+    });
+}
+
+function cmDisconnect() {
+    $('#cmDisconnectBtn').prop('disabled', true).text('Disconnecting...');
+    cmApiPost('/emailDelivery/disconnect/', {}, function(data) {
+        $('#cmDisconnectBtn').prop('disabled', false).text('Disconnect');
+        if (data.success) {
+            $('#disconnectModal').modal('hide');
+            new PNotify({title: 'Success', text: 'Disconnected from CyberMail.', type: 'success'});
+            setTimeout(function() { window.location.reload(); }, 1000);
+        } else {
+            new PNotify({title: 'Error', text: data.error || 'Failed to disconnect.', type: 'error'});
+        }
+    });
+}
+</script>
+
+<script src="{% static 'emailDelivery/emailDelivery.js' %}?v=2"></script>
+
+{% endblock %}
diff --git a/emailDelivery/urls.py b/emailDelivery/urls.py
new file mode 100644
index 000000000..d47b6ba13
--- /dev/null
+++ b/emailDelivery/urls.py
@@ -0,0 +1,30 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    path('', views.index, name='emailDeliveryHome'),
+    path('connect/', views.connect, name='emailDeliveryConnect'),
+    path('status/', views.getStatus, name='emailDeliveryStatus'),
+    path('disconnect/', views.disconnect, name='emailDeliveryDisconnect'),
+    # Domains
+    path('domains/add/', views.addDomain, name='emailDeliveryAddDomain'),
+    path('domains/list/', views.listDomains, name='emailDeliveryListDomains'),
+    path('domains/verify/', views.verifyDomain, name='emailDeliveryVerifyDomain'),
+    path('domains/dns-records/', views.getDnsRecords, name='emailDeliveryDnsRecords'),
+    path('domains/auto-configure-dns/', views.autoConfigureDns, name='emailDeliveryAutoConfigureDns'),
+    path('domains/remove/', views.removeDomain, name='emailDeliveryRemoveDomain'),
+    # SMTP Credentials
+    path('smtp/create/', views.createSmtpCredential, name='emailDeliverySmtpCreate'),
+    path('smtp/list/', views.listSmtpCredentials, name='emailDeliverySmtpList'),
+    path('smtp/rotate/', views.rotateSmtpPassword, name='emailDeliverySmtpRotate'),
+    path('smtp/delete/', views.deleteSmtpCredential, name='emailDeliverySmtpDelete'),
+    # Relay
+    path('relay/enable/', views.enableRelay, name='emailDeliveryRelayEnable'),
+    path('relay/disable/', views.disableRelay, name='emailDeliveryRelayDisable'),
+    # Stats & Logs
+    path('stats/', views.getStats, name='emailDeliveryStats'),
+    path('stats/domains/', views.getDomainStats, name='emailDeliveryDomainStats'),
+    path('logs/', views.getLogs, name='emailDeliveryLogs'),
+    # Health
+    path('health/', views.checkStatus, name='emailDeliveryHealth'),
+]
diff --git a/emailDelivery/views.py b/emailDelivery/views.py
new file mode 100644
index 000000000..6c8bef0c1
--- /dev/null
+++ b/emailDelivery/views.py
@@ -0,0 +1,184 @@
+from django.shortcuts import redirect
+from django.http import JsonResponse
+from loginSystem.views import loadLoginPage
+from .emailDeliveryManager import EmailDeliveryManager
+
+
+def index(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.home(request, userID)
+    except KeyError:
+        return redirect(loadLoginPage)
+
+
+def connect(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.connect(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def getStatus(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.getStatus(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def disconnect(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.disconnect(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def addDomain(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.addDomain(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def listDomains(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.listDomains(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def verifyDomain(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.verifyDomain(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def getDnsRecords(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.getDnsRecords(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def autoConfigureDns(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.autoConfigureDns(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def removeDomain(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.removeDomain(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def createSmtpCredential(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.createSmtpCredential(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def listSmtpCredentials(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.listSmtpCredentials(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def rotateSmtpPassword(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.rotateSmtpPassword(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def deleteSmtpCredential(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.deleteSmtpCredential(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def enableRelay(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.enableRelay(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def disableRelay(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.disableRelay(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def getStats(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.getStats(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def getDomainStats(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.getDomainStats(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def getLogs(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.getLogs(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
+
+
+def checkStatus(request):
+    try:
+        userID = request.session['userID']
+        em = EmailDeliveryManager()
+        return em.checkStatus(request, userID)
+    except KeyError:
+        return JsonResponse({'success': False, 'error': 'Not authenticated'})
diff --git a/emailMarketing/templates/emailMarketing/emailMarketing.html b/emailMarketing/templates/emailMarketing/emailMarketing.html
index e2ba1970b..f1ef45a84 100644
--- a/emailMarketing/templates/emailMarketing/emailMarketing.html
+++ b/emailMarketing/templates/emailMarketing/emailMarketing.html
@@ -7,6 +7,21 @@
 {% get_current_language as LANGUAGE_CODE %}
 <!-- Current language: {{ LANGUAGE_CODE }} -->
 
+<div id="cybermailBanner" style="display:none; margin-bottom:20px;">
+  <div style="background:linear-gradient(135deg,#4f46e5 0%,#7c3aed 50%,#9333ea 100%);border-radius:10px;padding:20px 24px;display:flex;align-items:center;gap:18px;box-shadow:0 4px 15px rgba(79,70,229,0.3);">
+    <div style="flex-shrink:0;font-size:32px;">&#9993;</div>
+    <div style="flex:1;min-width:0;">
+      <div style="font-weight:800;font-size:18px;color:#fff;margin-bottom:4px;letter-spacing:-0.3px;">Stop Landing in Spam</div>
+      <div style="font-size:13.5px;color:rgba(255,255,255,0.85);line-height:1.5;">Route your emails through CyberMail's optimized servers. <strong style="color:#fff;">15,000 emails/month free</strong> with automatic DNS configuration, real-time analytics, and dedicated IPs. <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:rgba(255,255,255,0.9);text-decoration:underline;font-weight:500;">Learn more</a></div>
+    </div>
+    <a href="/emailDelivery/" style="background:#fff;color:#4f46e5;padding:10px 24px;border-radius:7px;font-weight:700;font-size:13px;text-decoration:none;white-space:nowrap;flex-shrink:0;box-shadow:0 2px 8px rgba(0,0,0,0.1);transition:transform 0.15s;">Get Started Free &rarr;</a>
+    <button onclick="dismissCyberMailBanner()" style="background:none;border:none;color:rgba(255,255,255,0.6);font-size:20px;cursor:pointer;padding:0 4px;line-height:1;flex-shrink:0;" title="Dismiss">&times;</button>
+  </div>
+</div>
+<script>
+(function(){if(!document.cookie.includes('cybermail_dismiss=1')){document.getElementById('cybermailBanner').style.display='';}})();
+function dismissCyberMailBanner(){document.getElementById('cybermailBanner').style.display='none';document.cookie='cybermail_dismiss=1; path=/; max-age='+7*86400;}
+</script>
 
 <div class="container">
 
diff --git a/emailPremium/templates/emailPremium/emailPage.html b/emailPremium/templates/emailPremium/emailPage.html
index e91aba9a4..410efb15f 100644
--- a/emailPremium/templates/emailPremium/emailPage.html
+++ b/emailPremium/templates/emailPremium/emailPage.html
@@ -7,6 +7,22 @@
 {% get_current_language as LANGUAGE_CODE %}
 <!-- Current language: {{ LANGUAGE_CODE }} -->
 
+<div id="cybermailBanner" style="display:none; margin-bottom:20px;">
+  <div style="background:linear-gradient(135deg,#4f46e5 0%,#7c3aed 50%,#9333ea 100%);border-radius:10px;padding:20px 24px;display:flex;align-items:center;gap:18px;box-shadow:0 4px 15px rgba(79,70,229,0.3);">
+    <div style="flex-shrink:0;font-size:32px;">&#9993;</div>
+    <div style="flex:1;min-width:0;">
+      <div style="font-weight:800;font-size:18px;color:#fff;margin-bottom:4px;letter-spacing:-0.3px;">Stop Landing in Spam</div>
+      <div style="font-size:13.5px;color:rgba(255,255,255,0.85);line-height:1.5;">Route your emails through CyberMail's optimized servers. <strong style="color:#fff;">15,000 emails/month free</strong> with automatic DNS configuration, real-time analytics, and dedicated IPs. <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:rgba(255,255,255,0.9);text-decoration:underline;font-weight:500;">Learn more</a></div>
+    </div>
+    <a href="/emailDelivery/" style="background:#fff;color:#4f46e5;padding:10px 24px;border-radius:7px;font-weight:700;font-size:13px;text-decoration:none;white-space:nowrap;flex-shrink:0;box-shadow:0 2px 8px rgba(0,0,0,0.1);transition:transform 0.15s;">Get Started Free &rarr;</a>
+    <button onclick="dismissCyberMailBanner()" style="background:none;border:none;color:rgba(255,255,255,0.6);font-size:20px;cursor:pointer;padding:0 4px;line-height:1;flex-shrink:0;" title="Dismiss">&times;</button>
+  </div>
+</div>
+<script>
+(function(){if(!document.cookie.includes('cybermail_dismiss=1')){document.getElementById('cybermailBanner').style.display='';}})();
+function dismissCyberMailBanner(){document.getElementById('cybermailBanner').style.display='none';document.cookie='cybermail_dismiss=1; path=/; max-age='+7*86400;}
+</script>
+
 <div ng-controller="emailPage" class="container">
 
     <div id="page-title">
diff --git a/mailServer/templates/mailServer/createEmailAccount.html b/mailServer/templates/mailServer/createEmailAccount.html
index 5f381679d..b08abba4d 100644
--- a/mailServer/templates/mailServer/createEmailAccount.html
+++ b/mailServer/templates/mailServer/createEmailAccount.html
@@ -317,6 +317,22 @@
         }
     </style>
 
+    <div id="cybermailBanner" style="display:none; margin-bottom:20px;">
+      <div style="background:linear-gradient(135deg,#4f46e5 0%,#7c3aed 50%,#9333ea 100%);border-radius:10px;padding:20px 24px;display:flex;align-items:center;gap:18px;box-shadow:0 4px 15px rgba(79,70,229,0.3);">
+        <div style="flex-shrink:0;font-size:32px;">&#9993;</div>
+        <div style="flex:1;min-width:0;">
+          <div style="font-weight:800;font-size:18px;color:#fff;margin-bottom:4px;letter-spacing:-0.3px;">Stop Landing in Spam</div>
+          <div style="font-size:13.5px;color:rgba(255,255,255,0.85);line-height:1.5;">Route your emails through CyberMail's optimized servers. <strong style="color:#fff;">15,000 emails/month free</strong> with automatic DNS configuration, real-time analytics, and dedicated IPs. <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:rgba(255,255,255,0.9);text-decoration:underline;font-weight:500;">Learn more</a></div>
+        </div>
+        <a href="/emailDelivery/" style="background:#fff;color:#4f46e5;padding:10px 24px;border-radius:7px;font-weight:700;font-size:13px;text-decoration:none;white-space:nowrap;flex-shrink:0;box-shadow:0 2px 8px rgba(0,0,0,0.1);transition:transform 0.15s;">Get Started Free &rarr;</a>
+        <button onclick="dismissCyberMailBanner()" style="background:none;border:none;color:rgba(255,255,255,0.6);font-size:20px;cursor:pointer;padding:0 4px;line-height:1;flex-shrink:0;" title="Dismiss">&times;</button>
+      </div>
+    </div>
+    <script>
+    (function(){if(!document.cookie.includes('cybermail_dismiss=1')){document.getElementById('cybermailBanner').style.display='';}})();
+    function dismissCyberMailBanner(){document.getElementById('cybermailBanner').style.display='none';document.cookie='cybermail_dismiss=1; path=/; max-age='+7*86400;}
+    </script>
+
     <div class="modern-container" ng-controller="createEmailAccount">
         <div class="page-header">
             <h1 class="page-title">
diff --git a/mailServer/templates/mailServer/dkimManager.html b/mailServer/templates/mailServer/dkimManager.html
index 4ed9b1c11..faccfbf1b 100644
--- a/mailServer/templates/mailServer/dkimManager.html
+++ b/mailServer/templates/mailServer/dkimManager.html
@@ -398,6 +398,22 @@
         }
     </style>
 
+    <div id="cybermailBanner" style="display:none; margin-bottom:20px;">
+      <div style="background:linear-gradient(135deg,#4f46e5 0%,#7c3aed 50%,#9333ea 100%);border-radius:10px;padding:20px 24px;display:flex;align-items:center;gap:18px;box-shadow:0 4px 15px rgba(79,70,229,0.3);">
+        <div style="flex-shrink:0;font-size:32px;">&#9993;</div>
+        <div style="flex:1;min-width:0;">
+          <div style="font-weight:800;font-size:18px;color:#fff;margin-bottom:4px;letter-spacing:-0.3px;">Stop Landing in Spam</div>
+          <div style="font-size:13.5px;color:rgba(255,255,255,0.85);line-height:1.5;">Route your emails through CyberMail's optimized servers. <strong style="color:#fff;">15,000 emails/month free</strong> with automatic DNS configuration, real-time analytics, and dedicated IPs. <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:rgba(255,255,255,0.9);text-decoration:underline;font-weight:500;">Learn more</a></div>
+        </div>
+        <a href="/emailDelivery/" style="background:#fff;color:#4f46e5;padding:10px 24px;border-radius:7px;font-weight:700;font-size:13px;text-decoration:none;white-space:nowrap;flex-shrink:0;box-shadow:0 2px 8px rgba(0,0,0,0.1);transition:transform 0.15s;">Get Started Free &rarr;</a>
+        <button onclick="dismissCyberMailBanner()" style="background:none;border:none;color:rgba(255,255,255,0.6);font-size:20px;cursor:pointer;padding:0 4px;line-height:1;flex-shrink:0;" title="Dismiss">&times;</button>
+      </div>
+    </div>
+    <script>
+    (function(){if(!document.cookie.includes('cybermail_dismiss=1')){document.getElementById('cybermailBanner').style.display='';}})();
+    function dismissCyberMailBanner(){document.getElementById('cybermailBanner').style.display='none';document.cookie='cybermail_dismiss=1; path=/; max-age='+7*86400;}
+    </script>
+
     <div class="modern-container" ng-controller="dkimManager">
         <div class="page-header">
             <h1 class="page-title">
diff --git a/mailServer/templates/mailServer/index.html b/mailServer/templates/mailServer/index.html
index e0f619981..48e2b114b 100644
--- a/mailServer/templates/mailServer/index.html
+++ b/mailServer/templates/mailServer/index.html
@@ -7,6 +7,22 @@
     {% get_current_language as LANGUAGE_CODE %}
     <!-- Current language: {{ LANGUAGE_CODE }} -->
 
+    <div id="cybermailBanner" style="display:none; margin-bottom:20px;">
+      <div style="background:linear-gradient(135deg,#4f46e5 0%,#7c3aed 50%,#9333ea 100%);border-radius:10px;padding:20px 24px;display:flex;align-items:center;gap:18px;box-shadow:0 4px 15px rgba(79,70,229,0.3);">
+        <div style="flex-shrink:0;font-size:32px;">&#9993;</div>
+        <div style="flex:1;min-width:0;">
+          <div style="font-weight:800;font-size:18px;color:#fff;margin-bottom:4px;letter-spacing:-0.3px;">Stop Landing in Spam</div>
+          <div style="font-size:13.5px;color:rgba(255,255,255,0.85);line-height:1.5;">Route your emails through CyberMail's optimized servers. <strong style="color:#fff;">15,000 emails/month free</strong> with automatic DNS configuration, real-time analytics, and dedicated IPs. <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:rgba(255,255,255,0.9);text-decoration:underline;font-weight:500;">Learn more</a></div>
+        </div>
+        <a href="/emailDelivery/" style="background:#fff;color:#4f46e5;padding:10px 24px;border-radius:7px;font-weight:700;font-size:13px;text-decoration:none;white-space:nowrap;flex-shrink:0;box-shadow:0 2px 8px rgba(0,0,0,0.1);transition:transform 0.15s;">Get Started Free &rarr;</a>
+        <button onclick="dismissCyberMailBanner()" style="background:none;border:none;color:rgba(255,255,255,0.6);font-size:20px;cursor:pointer;padding:0 4px;line-height:1;flex-shrink:0;" title="Dismiss">&times;</button>
+      </div>
+    </div>
+    <script>
+    (function(){if(!document.cookie.includes('cybermail_dismiss=1')){document.getElementById('cybermailBanner').style.display='';}})();
+    function dismissCyberMailBanner(){document.getElementById('cybermailBanner').style.display='none';document.cookie='cybermail_dismiss=1; path=/; max-age='+7*86400;}
+    </script>
+
     <div class="container">
         <div id="page-title">
             <h2>{% trans "Mail Functions" %}</h2>
diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py
index 1cfb39a43..261ff314a 100644
--- a/plogical/mailUtilities.py
+++ b/plogical/mailUtilities.py
@@ -1704,6 +1704,103 @@ LogFile /var/log/clamav/clamav.log
 
 
 
+    @staticmethod
+    def configureRelayHost(smtpHost, smtpPort, smtpUser, smtpPassword):
+        try:
+            postfixPath = '/etc/postfix/main.cf'
+
+            with open(postfixPath, 'r') as f:
+                lines = f.readlines()
+
+            relayKeys = ['relayhost', 'smtp_sasl_auth_enable', 'smtp_sasl_password_maps',
+                         'smtp_sasl_security_options', 'smtp_tls_security_level']
+
+            filteredLines = []
+            for line in lines:
+                stripped = line.strip()
+                skip = False
+                for key in relayKeys:
+                    if stripped.startswith(key + ' ') or stripped.startswith(key + '='):
+                        skip = True
+                        break
+                if not skip:
+                    filteredLines.append(line)
+
+            relayConfig = [
+                '\n# CyberMail SMTP Relay Configuration\n',
+                'relayhost = [%s]:%s\n' % (smtpHost, smtpPort),
+                'smtp_sasl_auth_enable = yes\n',
+                'smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd\n',
+                'smtp_sasl_security_options = noanonymous\n',
+                'smtp_tls_security_level = encrypt\n',
+            ]
+
+            with open(postfixPath, 'w') as f:
+                f.writelines(filteredLines)
+                f.writelines(relayConfig)
+
+            saslPath = '/etc/postfix/sasl_passwd'
+            with open(saslPath, 'w') as f:
+                f.write('[%s]:%s %s:%s\n' % (smtpHost, smtpPort, smtpUser, smtpPassword))
+
+            os.chmod(saslPath, 0o600)
+
+            ProcessUtilities.executioner('postmap /etc/postfix/sasl_passwd')
+            ProcessUtilities.executioner('systemctl reload postfix')
+
+            print('1,None')
+
+        except BaseException as msg:
+            logging.CyberCPLogFileWriter.writeToFile(str(msg) + ' [configureRelayHost]')
+            print('0,%s' % str(msg))
+
+    @staticmethod
+    def removeRelayHost():
+        try:
+            postfixPath = '/etc/postfix/main.cf'
+
+            with open(postfixPath, 'r') as f:
+                lines = f.readlines()
+
+            relayKeys = ['relayhost', 'smtp_sasl_auth_enable', 'smtp_sasl_password_maps',
+                         'smtp_sasl_security_options']
+            commentLine = '# CyberMail SMTP Relay Configuration\n'
+
+            filteredLines = []
+            for line in lines:
+                stripped = line.strip()
+                if line == commentLine:
+                    continue
+                skip = False
+                for key in relayKeys:
+                    if stripped.startswith(key + ' ') or stripped.startswith(key + '='):
+                        skip = True
+                        break
+                if not skip:
+                    if stripped.startswith('smtp_tls_security_level'):
+                        filteredLines.append('smtp_tls_security_level = may\n')
+                    else:
+                        filteredLines.append(line)
+
+            with open(postfixPath, 'w') as f:
+                f.writelines(filteredLines)
+
+            saslPath = '/etc/postfix/sasl_passwd'
+            saslDbPath = '/etc/postfix/sasl_passwd.db'
+
+            if os.path.exists(saslPath):
+                os.remove(saslPath)
+            if os.path.exists(saslDbPath):
+                os.remove(saslDbPath)
+
+            ProcessUtilities.executioner('systemctl reload postfix')
+
+            print('1,None')
+
+        except BaseException as msg:
+            logging.CyberCPLogFileWriter.writeToFile(str(msg) + ' [removeRelayHost]')
+            print('0,%s' % str(msg))
+
     ####### Imported below functions from mailserver/mailservermanager, need to refactor later
 
 class MailServerManagerUtils(multi.Thread):
@@ -2719,6 +2816,7 @@ milter_default_action = accept
             return 1, 'All checks are OK.'
 
 
+
 def main():
 
     parser = argparse.ArgumentParser(description='CyberPanel Installer')
@@ -2729,6 +2827,10 @@ def main():
     parser.add_argument('--tempConfigPath', help='Temporary Configuration Path!')
     parser.add_argument('--install', help='Enable/Disable Policy Server!')
     parser.add_argument('--tempStatusPath', help='Path of temporary status file.')
+    parser.add_argument('--smtpHost', help='SMTP relay host!')
+    parser.add_argument('--smtpPort', help='SMTP relay port!')
+    parser.add_argument('--smtpUser', help='SMTP relay username!')
+    parser.add_argument('--smtpPassword', help='SMTP relay password!')
 
 
 
@@ -2772,6 +2874,10 @@ def main():
         mailUtilities.SetupEmailLimits()
     elif args.function == 'SaveEmailLimitsNew':
         mailUtilities.SaveEmailLimitsNew(args.tempConfigPath)
+    elif args.function == 'configureRelayHost':
+        mailUtilities.configureRelayHost(args.smtpHost, args.smtpPort, args.smtpUser, args.smtpPassword)
+    elif args.function == 'removeRelayHost':
+        mailUtilities.removeRelayHost()
 
 if __name__ == "__main__":
     main()
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index afd587891..1fa3ba792 100644
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -1678,6 +1678,54 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout';
             except:
                 pass
 
+            # CyberMail Email Delivery Tables
+            try:
+                cursor.execute('''
+                    CREATE TABLE `cybermail_accounts` (
+                        `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+                        `admin_id` integer NOT NULL UNIQUE,
+                        `platform_account_id` integer DEFAULT NULL,
+                        `api_key` varchar(255) NOT NULL DEFAULT '',
+                        `email` varchar(255) NOT NULL DEFAULT '',
+                        `plan_name` varchar(100) NOT NULL DEFAULT 'Free',
+                        `plan_slug` varchar(50) NOT NULL DEFAULT 'free',
+                        `emails_per_month` integer NOT NULL DEFAULT 15000,
+                        `is_connected` bool NOT NULL DEFAULT 0,
+                        `relay_enabled` bool NOT NULL DEFAULT 0,
+                        `smtp_credential_id` integer DEFAULT NULL,
+                        `smtp_username` varchar(255) NOT NULL DEFAULT '',
+                        `smtp_host` varchar(255) NOT NULL DEFAULT 'mail.cyberpersons.com',
+                        `smtp_port` integer NOT NULL DEFAULT 587,
+                        `created_at` datetime(6) NOT NULL,
+                        `updated_at` datetime(6) NOT NULL,
+                        CONSTRAINT `cybermail_accounts_admin_id_fk` FOREIGN KEY (`admin_id`)
+                        REFERENCES `loginSystem_administrator` (`id`) ON DELETE CASCADE
+                    )
+                ''')
+            except:
+                pass
+
+            try:
+                cursor.execute('''
+                    CREATE TABLE `cybermail_domains` (
+                        `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+                        `account_id` integer NOT NULL,
+                        `domain` varchar(255) NOT NULL DEFAULT '',
+                        `platform_domain_id` integer DEFAULT NULL,
+                        `status` varchar(50) NOT NULL DEFAULT 'pending',
+                        `spf_verified` bool NOT NULL DEFAULT 0,
+                        `dkim_verified` bool NOT NULL DEFAULT 0,
+                        `dmarc_verified` bool NOT NULL DEFAULT 0,
+                        `dns_configured` bool NOT NULL DEFAULT 0,
+                        `created_at` datetime(6) NOT NULL,
+                        KEY `cybermail_domains_account_id_idx` (`account_id`),
+                        CONSTRAINT `cybermail_domains_account_id_fk` FOREIGN KEY (`account_id`)
+                        REFERENCES `cybermail_accounts` (`id`) ON DELETE CASCADE
+                    )
+                ''')
+            except:
+                pass
+
             try:
                 cursor.execute(
                     'CREATE TABLE `loginSystem_acl` (`id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY, `name` varchar(50) NOT NULL UNIQUE, `adminStatus` integer NOT NULL DEFAULT 0, `versionManagement` integer NOT NULL DEFAULT 0, `createNewUser` integer NOT NULL DEFAULT 0, `deleteUser` integer NOT NULL DEFAULT 0, `resellerCenter` integer NOT NULL DEFAULT 0, `changeUserACL` integer NOT NULL DEFAULT 0, `createWebsite` integer NOT NULL DEFAULT 0, `modifyWebsite` integer NOT NULL DEFAULT 0, `suspendWebsite` integer NOT NULL DEFAULT 0, `deleteWebsite` integer NOT NULL DEFAULT 0, `createPackage` integer NOT NULL DEFAULT 0, `deletePackage` integer NOT NULL DEFAULT 0, `modifyPackage` integer NOT NULL DEFAULT 0, `createDatabase` integer NOT NULL DEFAULT 0, `deleteDatabase` integer NOT NULL DEFAULT 0, `listDatabases` integer NOT NULL DEFAULT 0, `createNameServer` integer NOT NULL DEFAULT 0, `createDNSZone` integer NOT NULL DEFAULT 0, `deleteZone` integer NOT NULL DEFAULT 0, `addDeleteRecords` integer NOT NULL DEFAULT 0, `createEmail` integer NOT NULL DEFAULT 0, `deleteEmail` integer NOT NULL DEFAULT 0, `emailForwarding` integer NOT NULL DEFAULT 0, `changeEmailPassword` integer NOT NULL DEFAULT 0, `dkimManager` integer NOT NULL DEFAULT 0, `createFTPAccount` integer NOT NULL DEFAULT 0, `deleteFTPAccount` integer NOT NULL DEFAULT 0, `listFTPAccounts` integer NOT NULL DEFAULT 0, `createBackup` integer NOT NULL DEFAULT 0, `restoreBackup` integer NOT NULL DEFAULT 0, `addDeleteDestinations` integer NOT NULL DEFAULT 0, `scheduleBackups` integer NOT NULL DEFAULT 0, `remoteBackups` integer NOT NULL DEFAULT 0, `manageSSL` integer NOT NULL DEFAULT 0, `hostnameSSL` integer NOT NULL DEFAULT 0, `mailServerSSL` integer NOT NULL DEFAULT 0)')
diff --git a/webmail/templates/webmail/index.html b/webmail/templates/webmail/index.html
index d552a3164..822323b7e 100644
--- a/webmail/templates/webmail/index.html
+++ b/webmail/templates/webmail/index.html
@@ -8,6 +8,21 @@
 
 <div class="webmail-container" ng-controller="webmailCtrl" ng-init="init()">
 
+    <div id="cybermailBanner" style="display:none;flex-shrink:0;">
+      <div style="padding:10px 20px;display:flex;align-items:center;gap:14px;background:linear-gradient(135deg,#4f46e5 0%,#7c3aed 50%,#9333ea 100%);">
+        <div style="flex-shrink:0;font-size:22px;">&#9993;</div>
+        <div style="flex:1;min-width:0;font-size:12.5px;color:rgba(255,255,255,0.85);">
+          <span style="color:#fff;font-weight:800;font-size:13.5px;">Stop Landing in Spam</span> &mdash; Route emails through CyberMail. <strong style="color:#fff;">15,000 emails/month free.</strong> <a href="https://cyberpanel.net/KnowledgeBase/cybermail-user-guide/" target="_blank" style="color:rgba(255,255,255,0.9);text-decoration:underline;">Learn more</a>
+        </div>
+        <a href="/emailDelivery/" style="background:#fff;color:#4f46e5;padding:6px 18px;border-radius:5px;font-weight:700;font-size:11.5px;text-decoration:none;white-space:nowrap;flex-shrink:0;">Get Started Free &rarr;</a>
+        <button onclick="dismissCyberMailBanner()" style="background:none;border:none;color:rgba(255,255,255,0.5);font-size:18px;cursor:pointer;padding:0 2px;line-height:1;flex-shrink:0;" title="Dismiss">&times;</button>
+      </div>
+    </div>
+    <script>
+    (function(){if(!document.cookie.includes('cybermail_dismiss=1')){document.getElementById('cybermailBanner').style.display='';}})();
+    function dismissCyberMailBanner(){document.getElementById('cybermailBanner').style.display='none';document.cookie='cybermail_dismiss=1; path=/; max-age='+7*86400;}
+    </script>
+
     <!-- Account Switcher Bar -->
     <div class="wm-account-bar" ng-show="managedAccounts.length > 1">
         <div class="wm-account-current">