From 9041891557d685b9da86e32bf9c71ff6f8bc51a4 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Wed, 27 Aug 2014 22:57:03 -0700
Subject: [PATCH] Fixed crash on expire mail success, messages where switched
 accidentally

---
 ucs/database.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ucs/database.cpp b/ucs/database.cpp
index d3c44174c..8eb8746b3 100644
--- a/ucs/database.cpp
+++ b/ucs/database.cpp
@@ -523,9 +523,10 @@ void Database::ExpireMail() {
                             time(nullptr) - RuleI(Mail, ExpireTrash));
         results = QueryDatabase(query);
 		if(!results.Success())
-            _log(UCS__INIT, "Expired %i trash messages.", results.RowsAffected());
+            _log(UCS__ERROR, "Error expiring trash messages, %s %s", query.c_str(), results.ErrorMessage().c_str());
 		else
-			_log(UCS__ERROR, "Error expiring trash messages, %s %s", query.c_str(), results.ErrorMessage().c_str());
+            _log(UCS__INIT, "Expired %i trash messages.", results.RowsAffected());
+
 	}
 
 	// Expire Read