diff --git a/kpimtextedit/emailquotehighlighter.cpp b/kpimtextedit/emailquotehighlighter.cpp
index c970eeaee..fb27eccde 100644
--- a/kpimtextedit/emailquotehighlighter.cpp
+++ b/kpimtextedit/emailquotehighlighter.cpp
@@ -1,162 +1,167 @@
 /**
  * Copyright (C)  2006  Laurent Montel <montel@kde.org>
  * Copyright (C)  2008  Thomas McGuire <mcguire@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
 
 #include "emailquotehighlighter.h"
 
 #include "textedit.h"
+#include <kdeversion.h>
 
 namespace KPIMTextEdit {
 
 class EMailQuoteHighlighter::EMailQuoteHighlighterPrivate
 {
 public:
     QColor col1, col2, col3, misspelledColor;
     bool spellCheckingEnabled;
     TextEdit *parent;
 };
 
 EMailQuoteHighlighter::EMailQuoteHighlighter( TextEdit *textEdit,
                                               const QColor &normalColor,
                                               const QColor &quoteDepth1,
                                               const QColor &quoteDepth2,
                                               const QColor &quoteDepth3,
                                               const QColor &misspelledColor )
     : Highlighter( textEdit, textEdit->configFile() ),
       d( new EMailQuoteHighlighterPrivate() )
 {
     Q_UNUSED( normalColor );
     // Don't automatically disable the spell checker, for example because there
     // are too many misspelled words. That would also disable quote highlighting.
     // FIXME: disable this spell checking!
     setAutomatic( false );
 
     setActive( true );
     d->col1 = quoteDepth1;
     d->col2 = quoteDepth2;
     d->col3 = quoteDepth3;
     d->misspelledColor = misspelledColor;
     d->spellCheckingEnabled = false;
     d->parent = textEdit;
 }
 
 EMailQuoteHighlighter::~EMailQuoteHighlighter()
 {
 }
 
 QString EMailQuoteHighlighter::highlightText( const QString &text,
                        const QColor &quoteDepth1,
                        const QColor &quoteDepth2,
                        const QColor &quoteDepth3 )
 {
     const QStringList splitted = text.split( QLatin1Char('\n') );
     QString result;
     QStringList::const_iterator it = splitted.constBegin();
     while ( it != splitted.constEnd() ) {
         result.append( highlightParagraph(( *it ) + QLatin1Char('\n'),
                        quoteDepth1, quoteDepth2, quoteDepth3 ) );
         ++it;
     }
     return result;
 }
 
 QString EMailQuoteHighlighter::highlightParagraph( const QString& text,
                             const QColor &quoteDepth1,
                             const QColor &quoteDepth2,
                             const QColor &quoteDepth3 )
 {
     QString simplified = text;
     simplified = simplified.remove( QRegExp( QLatin1String( "\\s" ) ) )
                            .replace( QLatin1Char( '|' ), QLatin1Char( '>' ) )
                            .replace( QLatin1String( "&gt;"), QLatin1String( ">" ));
 
     while ( simplified.startsWith( QLatin1String(">>>>") ) )
         simplified = simplified.mid( 3 );
 
     QString result( QLatin1String("<font color=\"%1\">%2</font>") );
     if ( simplified.startsWith( QLatin1String( ">>>" ) ) ) {
         return result.arg( quoteDepth3.name(), text);
     } else if ( simplified.startsWith( QLatin1String( ">>" ) ) ) {
         return result.arg( quoteDepth2.name(), text);
     } else if ( simplified.startsWith( QLatin1String( ">" ) ) ) {
         return result.arg( quoteDepth1.name(), text);
     }
 
     return text;
 }
 
 void EMailQuoteHighlighter::setQuoteColor( const QColor &normalColor,
                                            const QColor &quoteDepth1,
                                            const QColor &quoteDepth2,
                                            const QColor &quoteDepth3,
                                            const QColor &misspelledColor )
 {
     Q_UNUSED( normalColor );
     d->col1 = quoteDepth1;
     d->col2 = quoteDepth2;
     d->col3 = quoteDepth3;
     d->misspelledColor = misspelledColor;
 }
 
 void EMailQuoteHighlighter::toggleSpellHighlighting( bool on )
 {
     if ( on != d->spellCheckingEnabled ) {
         d->spellCheckingEnabled = on;
         rehighlight();
     }
 }
 
 void EMailQuoteHighlighter::highlightBlock( const QString & text )
 {
     QString simplified = text;
     simplified = simplified.remove( QRegExp( QLatin1String( "\\s" ) ) )
                            .replace( QLatin1Char( '|' ), QLatin1Char( '>' ) );
 
     while ( simplified.startsWith( QLatin1String(">>>>") ) )
         simplified = simplified.mid( 3 );
     if ( simplified.startsWith( QLatin1String(">>>") ) )
         setFormat( 0, text.length(), d->col3 );
     else if ( simplified.startsWith( QLatin1String(">>") ) )
         setFormat( 0, text.length(), d->col2 );
     else if ( simplified.startsWith( QLatin1String(">") ) )
         setFormat( 0, text.length(), d->col1 );
     else if ( d->parent->isLineQuoted( text ) ) {
         setFormat( 0, text.length(), d->col1 ); // FIXME: custom quote prefix can't handle multiple levels
     }
     else
     {
-        if ( d->spellCheckingEnabled && checkerEnabledByDefault() )
+        if ( d->spellCheckingEnabled 
+#if KDE_IS_VERSION(4,5,0)			
+			&& checkerEnabledByDefault() 
+#endif			
+			)
             Highlighter::highlightBlock( text );
     }
     setCurrentBlockState( 0 );
 }
 
 void EMailQuoteHighlighter::unsetMisspelled( int start,  int count )
 {
     Q_UNUSED( start )
     Q_UNUSED( count )
 }
 
 void EMailQuoteHighlighter::setMisspelled( int start, int count )
 {
     setMisspelledColor( d->misspelledColor );
     Sonnet::Highlighter::setMisspelled( start, count );
 }
 
 }