From bba2ad4a0940f2e03a639b5863103874d9e48e50 Mon Sep 17 00:00:00 2001
From: Pradeepto Bhattacharya <pradeepto@kde.org>
Date: Thu, 17 May 2007 15:14:54 +0000
Subject: [PATCH] Merge .. from 3.5 ... SVN commit 627641 by winterz:

Fix for the grave bug "kmail crash when I make a CTRL + J in inbox"

BUGS: 140660

svn path=/branches/kdepim/enterprise/kdepim/; revision=665658
---
 kmfolder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmfolder.cpp b/kmfolder.cpp
index e2d752dab..3d6c111cf 100644
--- a/kmfolder.cpp
+++ b/kmfolder.cpp
@@ -422,12 +422,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage> q, int* index_return )
 
 int KMFolder::find( const KMMsgBase* msg ) const
 {
-  return mStorage->find( msg );
+  return mStorage ? mStorage->find( msg ) : 0;
 }
 
 int KMFolder::find( const KMMessage* msg ) const
 {
-  return mStorage->find( msg );
+  return mStorage ? mStorage->find( msg ) : 0;
 }
 
 int KMFolder::count( bool cache ) const