diff --git a/callback.cpp b/callback.cpp
index 06e75b389..3953ea65e 100644
--- a/callback.cpp
+++ b/callback.cpp
@@ -243,6 +243,11 @@ bool Callback::exchangeCompatibleInvitations() const
   return GlobalSettings::self()->exchangeCompatibleInvitations();
 }
 
+bool Callback::outlookCompatibleInvitationReplyComments() const
+{
+  return GlobalSettings::self()->outlookCompatibleInvitationReplyComments();
+}
+
 QString Callback::sender() const
 {
   return mMsg->from();
diff --git a/callback.h b/callback.h
index 2120a3811..456f20ddb 100644
--- a/callback.h
+++ b/callback.h
@@ -81,6 +81,7 @@ class KMAIL_EXPORT Callback {
     bool deleteInvitationAfterReply() const;
     void deleteInvitation() const;
   bool exchangeCompatibleInvitations() const;
+  bool outlookCompatibleInvitationReplyComments() const;
 
     /**
       Closes the main window showing this message, if it's a secondary window.
diff --git a/configuredialog.cpp b/configuredialog.cpp
index 2a573d6d8..cc27457ef 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -5318,6 +5318,16 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( QWidget* parent )
   connect( mExchangeCompatibleInvitations, SIGNAL( stateChanged( int ) ),
            this, SLOT( slotEmitChanged( void ) ) );
 
+  mOutlookCompatibleInvitationComments =
+    new QCheckBox( i18n( "Outlook compatible invitation reply comments" ), gBox );
+  mOutlookCompatibleInvitationComments->setToolTip(
+    i18n( "Send invitation reply comments in a way that "
+          "Microsoft Outlook(tm) understands." ) );
+  mOutlookCompatibleInvitationComments->setWhatsThis( i18n( GlobalSettings::self()->
+           outlookCompatibleInvitationReplyCommentsItem()->whatsThis().utf8() ) );
+  connect( mOutlookCompatibleInvitationComments, SIGNAL( stateChanged( int ) ),
+           this, SLOT( slotEmitChanged( void ) ) );
+
   mAutomaticSending = new QCheckBox( i18n( "Automatic invitation sending" ), gBox );
   mAutomaticSending->setToolTip( i18n( "When this is on, the user will not see the mail composer window. Invitation mails are sent automatically" ) );
   mAutomaticSending->setWhatsThis( i18n( GlobalSettings::self()->
@@ -5364,6 +5374,8 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
   mLegacyBodyInvites->setChecked( GlobalSettings::self()->legacyBodyInvites() );
   mLegacyBodyInvites->blockSignals( false );
 
+  mOutlookCompatibleInvitationComments->setChecked( GlobalSettings::self()->outlookCompatibleInvitationReplyComments() );
+
   mAutomaticSending->setChecked( GlobalSettings::self()->automaticSending() );
   mAutomaticSending->setEnabled( !mLegacyBodyInvites->isChecked() );
 
@@ -5433,6 +5445,7 @@ void MiscPage::GroupwareTab::save()
   GlobalSettings::self()->setLegacyMangleFromToHeaders( mLegacyMangleFromTo->isChecked() );
   GlobalSettings::self()->setLegacyBodyInvites( mLegacyBodyInvites->isChecked() );
   GlobalSettings::self()->setExchangeCompatibleInvitations( mExchangeCompatibleInvitations->isChecked() );
+  GlobalSettings::self()->setOutlookCompatibleInvitationReplyComments( mOutlookCompatibleInvitationComments->isChecked() );
   GlobalSettings::self()->setAutomaticSending( mAutomaticSending->isChecked() );
 
   int format = mStorageFormatCombo->currentIndex();
diff --git a/configuredialog_p.h b/configuredialog_p.h
index c40516984..b18d09437 100644
--- a/configuredialog_p.h
+++ b/configuredialog_p.h
@@ -1126,6 +1126,7 @@ private:
   QCheckBox* mLegacyMangleFromTo;
   QCheckBox* mLegacyBodyInvites;
   QCheckBox* mExchangeCompatibleInvitations;
+  QCheckBox* mOutlookCompatibleInvitationComments;
   QCheckBox* mAutomaticSending;
 };
 
diff --git a/kmail.kcfg.cmake b/kmail.kcfg.cmake
index acb430f3a..9cfc896c7 100644
--- a/kmail.kcfg.cmake
+++ b/kmail.kcfg.cmake
@@ -183,6 +183,12 @@
         <default>false</default>
       </entry>
 
+      <entry name="OutlookCompatibleInvitationReplyComments" type="Bool">
+        <label>Outlook compatible invitation reply comments</label>
+        <whatsthis>When replying to invitations, send the reply comment in way that Microsoft Outlook understands.</whatsthis>
+        <default>false</default>
+      </entry>
+
       <entry name="AutomaticSending" type="Bool">
         <label>Automatic invitation sending</label>
         <whatsthis>When this is checked, you will not see the mail composer window. Instead, all invitation mails are sent automatically. If you want to see the mail before sending it, you can uncheck this option. However, be aware that the text in the composer window is in iCalendar syntax, and you should not try modifying it by hand.</whatsthis>