diff --git a/inbound.php b/inbound.php
index db16ae0..d056af8 100644
--- a/inbound.php
+++ b/inbound.php
@@ -13,13 +13,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action'])) {
         $id = $_POST['id'] ?? 0;
         $ref_no = $_POST['ref_no'] ?? '';
         $date_registered = $_POST['date_registered'] ?? date('Y-m-d');
-        $due_date = $_POST['due_date'] ?? null;
+        $due_date = !empty($_POST['due_date']) ? $_POST['due_date'] : null;
         $sender = $_POST['sender'] ?? '';
         $recipient = $_POST['recipient'] ?? '';
         $subject = $_POST['subject'] ?? '';
         $description = $_POST['description'] ?? '';
-        $status_id = $_POST['status_id'] ?? null;
-        $assigned_to = $_POST['assigned_to'] ?? null;
+        $status_id = !empty($_POST['status_id']) ? $_POST['status_id'] : null;
+        $assigned_to = !empty($_POST['assigned_to']) ? $_POST['assigned_to'] : null;
 
         if ($action === 'add' || $action === 'edit') {
             try {
diff --git a/internal_outbox.php b/internal_outbox.php
index 6a75d7b..3ae13ce 100644
--- a/internal_outbox.php
+++ b/internal_outbox.php
@@ -15,7 +15,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
     if (!canAdd('internal')) {
         $error = 'عذراً، ليس لديك الصلاحية لإرسال رسائل';
     } else {
-        $recipient_id = $_POST['recipient_id'] ?? null;
+        $recipient_id = !empty($_POST['recipient_id']) ? $_POST['recipient_id'] : null;
         $subject = $_POST['subject'] ?? '';
         $description = $_POST['description'] ?? '';
         $type = 'internal';
diff --git a/outbound.php b/outbound.php
index e0a67b6..1b4fbcd 100644
--- a/outbound.php
+++ b/outbound.php
@@ -13,13 +13,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action'])) {
         $id = $_POST['id'] ?? 0;
         $ref_no = $_POST['ref_no'] ?? '';
         $date_registered = $_POST['date_registered'] ?? date('Y-m-d');
-        $due_date = $_POST['due_date'] ?? null;
+        $due_date = !empty($_POST['due_date']) ? $_POST['due_date'] : null;
         $sender = $_POST['sender'] ?? '';
         $recipient = $_POST['recipient'] ?? '';
         $subject = $_POST['subject'] ?? '';
         $description = $_POST['description'] ?? '';
-        $status_id = $_POST['status_id'] ?? null;
-        $assigned_to = $_POST['assigned_to'] ?? null;
+        $status_id = !empty($_POST['status_id']) ? $_POST['status_id'] : null;
+        $assigned_to = !empty($_POST['assigned_to']) ? $_POST['assigned_to'] : null;
 
         if ($action === 'add' || $action === 'edit') {
             try {
@@ -311,6 +311,10 @@ if (isset($_GET['id'])) {
                             <label class="form-label small fw-bold">محتوى الخطاب / الوصف</label>
                             <textarea name="description" id="description_editor" class="form-control" rows="5"></textarea>
                         </div>
+                        <div class="col-md-6">
+                            <label class="form-label small fw-bold">تاريخ الاستحقاق (اختياري)</label>
+                            <input type="date" name="due_date" id="modalDueDate" class="form-control">
+                        </div>
                         <div class="col-md-6">
                             <label class="form-label small fw-bold">الحالة</label>
                             <select name="status_id" id="modalStatusId" class="form-select" required>
@@ -319,7 +323,7 @@ if (isset($_GET['id'])) {
                                 <?php endforeach; ?>
                             </select>
                         </div>
-                        <div class="col-md-6">
+                        <div class="col-md-12">
                             <label class="form-label small fw-bold">إسناد للمتابعة (اختياري)</label>
                             <select name="assigned_to" id="modalAssignedTo" class="form-select">
                                 <option value="">--- اختر مستخدم ---</option>
@@ -513,4 +517,4 @@ document.addEventListener('DOMContentLoaded', function() {
 });
 </script>
 
-<?php require_once 'includes/footer.php'; ?>
\ No newline at end of file
+<?php require_once 'includes/footer.php'; ?>
diff --git a/print_outbound.php b/print_outbound.php
index 6782b1d..af16015 100644
--- a/print_outbound.php
+++ b/print_outbound.php
@@ -8,11 +8,10 @@ if (!isset($_SESSION['user_id'])) {
     die('Access Denied');
 }
 
-// Basic permission check (matches header.php logic)
+// Basic permission check
 function isAdmin() {
     if (isset($_SESSION['is_super_admin']) && $_SESSION['is_super_admin'] == 1) return true;
     if (isset($_SESSION['user_role']) && strtolower($_SESSION['user_role']) === 'admin') return true;
-    if (isset($_SESSION['role']) && strtolower($_SESSION['role']) === 'admin') return true;
     return false;
 }
 
@@ -95,164 +94,148 @@ $hijriDate = gregorianToHijri($mail['date_registered']);
     <style>
         @page {
             size: A4;
-            margin: 1cm 1.5cm 2cm 1.5cm; /* Reserved 2cm at bottom for fixed footer */
+            margin: 0;
         }
         body {
             font-family: 'Cairo', 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            background-color: #fff;
+            background-color: #f4f7f6;
             color: #333;
             margin: 0;
             padding: 0;
             line-height: 1.6;
         }
-        .print-container {
-            width: 100%;
-            max-width: 21cm;
+        
+        .print-wrapper {
+            width: 21cm;
             margin: 0 auto;
-            padding: 20px;
-        }
-        .header {
+            background: #fff;
+            padding: 1.5cm;
+            box-shadow: 0 0 10px rgba(0,0,0,0.1);
+            min-height: 29.7cm;
+            position: relative;
+            box-sizing: border-box;
             display: flex;
-            justify-content: space-between;
-            align-items: flex-start; /* Aligned to start for better header-info layout */
-            border-bottom: 3px double #333;
-            padding-bottom: 20px;
-            margin-bottom: 40px;
+            flex-direction: column;
         }
-        .header-logo img {
-            max-height: 100px;
-            max-width: 200px;
-        }
-        .header-info {
-            text-align: left;
-            line-height: 1.2;
-            margin-left: 1.5cm; /* Bring a little to the right from the left edge */
-            margin-top: 15px; /* Shifting a little down from the top edge */
-        }
-        .charity-name-header {
-            font-size: 24px;
-            font-weight: bold;
-            margin-bottom: 5px;
-            color: #00827F;
-        }
-        .charity-address-header {
-            font-size: 12px;
-            color: #00827F;
-            opacity: 0.85;
-        }
-        .header-title {
-            text-align: center;
+
+        /* Repeating Header */
+        .report-table {
+            width: 100%;
+            border-collapse: collapse;
             flex-grow: 1;
         }
-        .header-title h1 {
-            margin: 0;
-            font-size: 28px;
-            color: #000;
-            text-decoration: underline;
+        .report-header {
+            display: table-header-group;
         }
-        .mail-meta {
-            margin-bottom: 30px;
+        .report-footer {
+            display: table-footer-group;
+        }
+
+        /* Header Style */
+        .header-container {
+            border-bottom: 3px double #00827F;
+            padding-bottom: 10px;
+            margin-bottom: 20px;
             display: flex;
-            flex-wrap: wrap;
-            gap: 20px;
-            background: #fff;
-            padding: 10px 0;
+            justify-content: space-between;
+            align-items: flex-start;
         }
-        .meta-item {
-            flex: 1;
-            min-width: 200px;
+        .header-logo img {
+            max-height: 80px;
         }
-        .meta-label {
-            font-weight: bold;
-            color: #444;
-            font-size: 14px;
-            display: inline-block;
-            width: 100px;
-        }
-        .meta-value {
-            font-size: 16px;
-            color: #000;
-            border-bottom: 1px dotted #ccc;
-            padding-bottom: 2px;
-        }
-        .mail-content-container {
-            border: 1px solid #000;
-            padding: 30px;
-            min-height: 500px;
-            position: relative;
-            margin-top: 20px;
+        .header-info { text-align: left; }
+        .site-name { font-size: 24px; font-weight: bold; color: #00827F; margin-bottom: 5px; }
+
+        /* Meta & Content */
+        .mail-meta {
+            margin-bottom: 25px;
+            display: flex;
+            justify-content: space-between;
+            background: #f9f9f9;
+            padding: 12px;
+            border: 1px solid #eee;
         }
         .mail-content {
-            font-size: 16px;
+            font-size: 18px;
             text-align: justify;
+            color: #000;
+            min-height: 12cm;
+            padding-bottom: 30px;
         }
-        .footer {
-            margin-top: 40px;
-            padding-top: 20px; /* Matched to header padding-bottom */
-            border-top: 3px double #333; /* Equal to the top line style */
+
+        /* Footer Style */
+        .footer-container {
+            border-top: 3px double #00827F;
+            padding-top: 10px;
             text-align: center;
             font-size: 11px;
-            color: #000;
+            width: 100%;
+            background: #fff;
+            margin-top: auto;
         }
-        .footer-content {
+        .contact-row {
             display: flex;
             justify-content: center;
-            align-items: center;
-            flex-wrap: nowrap;
-            gap: 8px;
-            white-space: nowrap;
+            gap: 15px;
+            margin-bottom: 5px;
+            flex-wrap: wrap;
         }
-        .social-icons i {
-            margin: 0 2px;
-            font-size: 12px;
+        .page-num-display {
+            font-size: 14px;
+            font-weight: bold;
+            margin-top: 5px;
         }
-        .footer-sep {
-            color: #999;
-            margin: 0 2px;
+        
+        /* Footer Spacer for Table */
+        .footer-spacer {
+            height: 80px;
+            display: none;
         }
+
+        /* UI Controls */
         .no-print {
             position: fixed;
             top: 20px;
             left: 20px;
-            background: #212529;
+            background: #00827F;
             color: #fff;
-            border: none;
             padding: 10px 25px;
+            border: none;
             border-radius: 30px;
             cursor: pointer;
             z-index: 1000;
-            box-shadow: 0 4px 15px rgba(0,0,0,0.3);
             font-family: 'Cairo', sans-serif;
             font-weight: bold;
-            transition: all 0.3s;
-        }
-        .no-print:hover {
-            background: #000;
-            transform: translateY(-2px);
+            box-shadow: 0 4px 10px rgba(0,0,0,0.2);
         }
+
         @media print {
-            .no-print {
-                display: none;
+            @page { 
+                margin: 1cm 0;
             }
-            body {
-                background: none;
-            }
-            .print-container {
-                padding: 0;
+            body { background: #fff; }
+            .no-print { display: none; }
+            .print-wrapper {
+                width: 100%;
                 margin: 0;
-                max-width: 100%;
+                padding: 0 1.5cm;
+                box-shadow: none;
+                min-height: auto;
+                display: block;
             }
-            .mail-content-container {
-                border: none;
-                padding: 10px 0;
-            }
-            .footer {
+            
+            .footer-container {
                 position: fixed;
-                bottom: 0.5cm; /* Positioned inside the reserved 2cm bottom margin */
-                left: 1.5cm;
-                right: 1.5cm;
-                margin-top: 0;
-                background: white;
+                bottom: 0;
+                left: 0;
+                right: 0;
+                padding: 10px 1.5cm;
+                box-sizing: border-box;
+                z-index: 100;
+            }
+            
+            .footer-spacer {
+                display: block;
             }
         }
     </style>
@@ -260,67 +243,71 @@ $hijriDate = gregorianToHijri($mail['date_registered']);
 <body>
 
     <button class="no-print" onclick="window.print()">
-        <i class="fas fa-print me-1"></i> طباعة الوثيقة
+        <i class="fas fa-print"></i> طباعة الوثيقة
     </button>
 
-    <div class="print-container">
-        <div class="header">
-            <div class="header-logo">
-                <?php if ($logo): ?>
-                    <img src="<?= htmlspecialchars($logo) ?>" alt="Logo">
-                <?php else: ?>
-                    <div style="font-weight: bold; font-size: 24px; color: #1a73e8;"><?= htmlspecialchars($site_name) ?></div>
-                <?php endif; ?>
-            </div>
-            <div class="header-title">
-                <!-- Title removed as per user request -->
-            </div>
-            <div class="header-info">
-                <div class="charity-name-header"><?= htmlspecialchars($site_name) ?></div>
-                <div class="charity-address-header"><?= htmlspecialchars($site_address) ?></div>
-            </div>
-        </div>
+    <div class="print-wrapper">
+        <table class="report-table">
+            <thead class="report-header">
+                <tr>
+                    <td>
+                        <div class="header-container">
+                            <div class="header-logo">
+                                <?php if ($logo): ?>
+                                    <img src="<?= htmlspecialchars($logo) ?>" alt="Logo">
+                                <?php else: ?>
+                                    <div style="font-weight: bold; font-size: 26px; color: #00827F;"><?= htmlspecialchars($site_name) ?></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="header-info">
+                                <div class="site-name"><?= htmlspecialchars($site_name) ?></div>
+                                <div style="font-size: 12px; color: #666;"><?= htmlspecialchars($site_address) ?></div>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+            </thead>
+            
+            <tbody>
+                <tr>
+                    <td>
+                        <div class="mail-meta">
+                            <div><strong>رقم القيد:</strong> <?= htmlspecialchars($mail['ref_no']) ?></div>
+                            <div><strong>التاريخ:</strong> <?= htmlspecialchars($hijriDate) ?> | <?= htmlspecialchars($mail['date_registered']) ?>م</div>
+                        </div>
 
-        <div class="mail-meta">
-            <div class="meta-item">
-                <span class="meta-label">رقم القيد:</span>
-                <span class="meta-value"><?= htmlspecialchars($mail['ref_no']) ?></span>
-            </div>
-            <div class="meta-item" style="flex: 2;">
-                <span class="meta-label">التاريخ:</span>
-                <span class="meta-value">
-                    <?= htmlspecialchars($hijriDate) ?> 
-                    الموافق: 
-                    <?= htmlspecialchars($mail['date_registered']) ?>
+                        <div class="mail-content">
+                            <?= $mail['description'] ?>
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+            
+            <tfoot class="report-footer">
+                <tr>
+                    <td>
+                        <div class="footer-spacer"></div>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+
+        <div class="footer-container">
+            <div class="contact-row">
+                <span><i class="fas fa-phone"></i> 99621515</span>
+                <span><i class="fas fa-envelope"></i> ahlalhkair@gmail.com</span>
+                <span><i class="fas fa-globe"></i> https://alkhairteam.net/</span>
+                <span class="ms-3">
+                    <i class="fab fa-instagram"></i>
+                    <i class="fab fa-twitter"></i>
+                    <i class="fab fa-facebook"></i>
+                    alkhair_team
                 </span>
             </div>
-        </div>
-
-        <div class="mail-content-container">
-            <div class="mail-content">
-                <?= $mail['description'] ?>
-            </div>
-        </div>
-
-        <div class="footer">
-            <div class="footer-content">
-                <span>
-                    <strong>وسائل التواصل:</strong> ahlalhkair 
-                    <span class="social-icons">
-                        <i class="fab fa-twitter"></i>
-                        <i class="fab fa-instagram"></i>
-                        <i class="fab fa-facebook"></i>
-                    </span>
-                </span>
-                <span class="footer-sep">|</span>
-                <span><strong>هاتف:</strong> 99621515</span>
-                <span class="footer-sep">|</span>
-                <span><strong>الايميل:</strong> ahlalhkair@gmail.com</span>
-                <span class="footer-sep">|</span>
-                <span><strong>الموقع:</strong> https://alkhairteam.net/</span>
+            <div class="page-num-display">
             </div>
         </div>
     </div>
 
 </body>
-</html>
+</html>
\ No newline at end of file