From 8c42af79bb728336c907cf8a5515ad55f391719e Mon Sep 17 00:00:00 2001
From: Barijaona Ramaholimihaso <github.com@barijaona.com>
Date: Wed, 4 Sep 2013 05:12:04 +0300
Subject: [PATCH] Continuation of previous fix

---
 CHANGES        | 4 ++++
 notes.html     | 2 +-
 src/Database.m | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8b10a076ec..d5b03269c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,10 @@ most recent build should be at the top of this file.
 
 Thanks!
 
+3.0.0 Beta 18
+-------------
+- Improvement on Beta 17
+
 3.0.0 Beta 17
 -------------
 - Fix a serious problem with using the "Mark updated articles as new" preference
diff --git a/notes.html b/notes.html
index 73b0edbc24..ba82866e62 100644
--- a/notes.html
+++ b/notes.html
@@ -11,7 +11,7 @@
 
 <h1>Version notes</h1>
 
-<h2 id="beta17">3.0.0 Beta 17</h2>
+<h2 id="beta17">3.0.0 Beta 18</h2>
 <p><strong>Mac OS Snow Leopard (10.6) or later only !!!</strong></p>
 
 <ul>
diff --git a/src/Database.m b/src/Database.m
index 2a5bccbd37..e70e43034b 100644
--- a/src/Database.m
+++ b/src/Database.m
@@ -1557,7 +1557,7 @@ -(BOOL)createArticle:(NSInteger)folderID article:(Article *)article guidHistory:
 				// If the folder is not displayed, then the article text has not been loaded yet.
 				if (existingBody == nil)
 				{
-					FMResultSet * results = [sqlDatabase executeQueryWithFormat:@"select text from messages where folder_id=%ld and message_id=%@", (long)folderID, preparedArticleGuid];
+					FMResultSet * results = [sqlDatabase executeQueryWithFormat:@"select text from messages where folder_id=%ld and message_id=%@", (long)folderID, articleGuid];
 					if ([results next])
 					{
 						existingBody = [results stringForColumn:@"text"];