--- kdepim-3.1.94/kmail/accountdialog.cpp--	2004-01-19 05:05:27.000000000 -0500
+++ kdepim-3.1.94/kmail/accountdialog.cpp	2004-01-19 05:05:50.000000000 -0500
@@ -941,11 +941,11 @@ void AccountDialog::makeImapAccountPage(
   buttonLay->addStretch();
   buttonLay->addWidget( mImap.checkCapabilities );
 
-#if 0 // ### (marc) this isn't ready for prime-time yet... Reactivate post-3.2.
+//#if 0 // ### (marc) this isn't ready for prime-time yet... Reactivate post-3.2.
   mSieveConfigEditor = new SieveConfigEditor( tabWidget );
   mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() );
   tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") );
-#endif
+//#endif
 
   connect(kapp,SIGNAL(kdisplayFontChanged()),SLOT(slotFontChanged()));
 }
--- kdepim-3.1.94/kmail/kmmainwidget.cpp--	2004-01-19 05:05:32.000000000 -0500
+++ kdepim-3.1.94/kmail/kmmainwidget.cpp	2004-01-19 05:06:12.000000000 -0500
@@ -2125,11 +2125,11 @@ void KMMainWidget::setupActions()
 		     SLOT(slotImport()), actionCollection(), "import" );
   if (KStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
 
-#if 0 // ### (marc) this isn't ready for prime-time yet - reactivate post 3.2
+//#if 0 // ### (marc) this isn't ready for prime-time yet - reactivate post 3.2
   (void) new KAction( i18n("Edit \"Out of Office\" Replies..."),
 		      "configure", 0, this, SLOT(slotEditVacation()),
 		      actionCollection(), "tools_edit_vacation" );
-#endif
+//#endif
 
   //----- Edit Menu
   mTrashAction = new KAction( KGuiItem( i18n("&Move to Trash"), "edittrash",