diff --git a/kmfilteraction.cpp b/kmfilteraction.cpp
index 403b35954..7b6e347b6 100644
--- a/kmfilteraction.cpp
+++ b/kmfilteraction.cpp
@@ -727,8 +727,6 @@ KMFilterAction::ReturnCode KMFilterActionExtFilter::process(KMMessage* aMsg, boo
 
   // write message to file
   QString msgText, tempFileName;
-  FILE *fh;
-  bool ok = TRUE;
 
   tempFileName = inFile->name();
   kCStringToFile( aMsg->asString().data(), tempFileName,
diff --git a/kmfolder.cpp b/kmfolder.cpp
index eb81a1d9c..8c30fd159 100644
--- a/kmfolder.cpp
+++ b/kmfolder.cpp
@@ -1921,8 +1921,11 @@ void KMFolder::setProcmailLockFileName( const QString &fname )
   mProcmailLockFileName = fname;
 }
 
-bool
-KMFolder::updateIndexStreamPtr(bool just_close)
+#ifdef HAVE_MMAP
+bool KMFolder::updateIndexStreamPtr(bool just_close)
+#else
+bool KMFolder::updateIndexStreamPtr(bool)
+#endif
 {
 #ifdef HAVE_MMAP
     if(just_close) {
diff --git a/kmheaders.cpp b/kmheaders.cpp
index f31d5d3eb..0195121d1 100644
--- a/kmheaders.cpp
+++ b/kmheaders.cpp
@@ -2550,7 +2550,6 @@ static void internalWriteItem(FILE *sortStream, int msgid, int parent_id,
 
 bool KMHeaders::writeSortOrder()
 {
-  int rc = 0;
   if (mSortInfo.removed)
     return TRUE; // Need serial ids to optimize this out
   QString sortFile = KMAIL_SORT_FILE(mFolder);
diff --git a/kmkernel.cpp b/kmkernel.cpp
index 20c83dbe0..2dfc2ff58 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -83,9 +83,6 @@ void KMKernel::checkMail () //might create a new reader but won
 
 void KMKernel::openReader()
 {
-#ifdef __GNUC__
-#warning Ugly hack! (sven)
-#endif
   KMMainWin *mWin = 0;
   KMainWindow *ktmw = 0;
   kdDebug() << "KMKernel::openReader called" << endl;
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index bc4b4bba4..aec909e22 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -450,7 +450,8 @@ void KMReaderWin::displayAboutPage()
     i18n("<p>Some of the new features in this release of KMail include "
     "(compared to KMail 1.2, which is part of KDE 2.1):</p>\n"
     "<ul>\n"
-    "<li>IMAP support</li>\n"
+    "<li>IMAP support including SSL and TLS</li>\n"
+    "<li>SSL and TLS support for POP3</li>\n"
     "<li>Non-blocking sending</li>\n"
     "<li>Performance improvements for huge folders</li>\n"
     "<li>Message scoring</li>\n"
@@ -466,8 +467,6 @@ void KMReaderWin::displayAboutPage()
     "<li>Better procmail support via the local account</li>\n"
     "<li>Messages can be flagged</li>\n"
     "<li>Read the new messages by only hitting the space key</li>\n"
-    "<li>SSL and TLS support for POP3</li>\n"
-    "<li>SSL support for IMAP</li>\n"
     "</ul>\n");
   if( kernel->firstStart() ) {
     info += i18n("<p>Please take a moment to fill in the KMail configuration panel at "