diff --git a/wrenchboard/email/JOB/job_pastdue_m.mailfile b/wrenchboard/email/JOB/job_pastdue_m.mailfile
index 431a4519..4aaa62b5 100644
--- a/wrenchboard/email/JOB/job_pastdue_m.mailfile
+++ b/wrenchboard/email/JOB/job_pastdue_m.mailfile
@@ -39,7 +39,6 @@ body {margin: 0; padding: 0; min-width: 100%!important; font-family: sans-serif;
 <tr>
 <td height="30" border="0" style="text-align:center;">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
-
 <tr>
 <td style="padding: 1px 0 1px 0; text-align:center;">
 <a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
diff --git a/wrenchboard/src/shared_tool/cron_email.cc b/wrenchboard/src/shared_tool/cron_email.cc
index 3cebf26b..6593d552 100644
--- a/wrenchboard/src/shared_tool/cron_email.cc
+++ b/wrenchboard/src/shared_tool/cron_email.cc
@@ -446,7 +446,7 @@ long CronJobEmail(long mailtype, CVars in, CVars &out) {
                 out["total_record"] = pgsql_num_rows(res);
 
                 for (int i = 0, n = pgsql_num_rows(res); i < n; i++) {
-                    x["color"] = "FFFFFF";
+                    in["color"] = "FFFFFF";
                     if (c > 0) {
                         in["color"] = "ebfaeb";
                     }
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 81626d09..660d7ebe 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -242,7 +242,7 @@ long cron_email(long mailtype, CVars in, CVars &out) {
                             " LEFT JOIN currency cc ON cc.country = mj.country "
                             " LEFT JOIN members m ON m.id=mc.client_id  "
                             "WHERE mc.member_id = %lu AND mc.status IN (1,2)  "
-                            " AND delivery_date < now() ", in["member_id"].Long());
+                            " AND mc.delivery_date < now() ORDER BY mc.delivery_date DESC LIMIT 8", in["member_id"].Long());
                     
                     
                     if (res != NULL && pgsql_num_rows(res) > 0) {