--- kdepim/libkdepim/kcmdesignerfields.cpp	2005/09/08 15:37:56	458580
+++ kdepim/libkdepim/kcmdesignerfields.cpp	2006/04/15 12:39:26	530112
@@ -99,8 +99,7 @@
         }
 
         delete list;
-      } else
-        delete wdg;
+      } 
     }
 
     QString name() const { return mName; }
--- kdepim/libkdepim/kfoldertree.cpp	2005/07/26 18:54:59	438982
+++ kdepim/libkdepim/kfoldertree.cpp	2006/04/15 12:39:26	530112
@@ -225,9 +225,9 @@
 
     KListViewItem::paintCell( p, cg, column, width, align );
 
-    int r = lv ? lv->itemMargin() : 1;
     const QPixmap *icon = pixmap( column );
     int marg = lv ? lv->itemMargin() : 1;
+    int r = marg;
 
     QString t;
     QRect br;
@@ -238,7 +238,7 @@
       p->setPen( ft->paintInfo().colFore );
 
     if ( icon ) {
-      r += icon->width() + lv->itemMargin();
+      r += icon->width() + marg;
     }
     t = text( column );
     if ( !t.isEmpty() )
--- kdepim/libkdepim/kscoringeditor.cpp	2006/03/24 15:55:54	522155
+++ kdepim/libkdepim/kscoringeditor.cpp	2006/05/06 09:14:35	537923
@@ -127,8 +127,8 @@
 
 void SingleConditionWidget::toggleRegExpButton( int selected )
 {
-  bool isRegExp = KScoringExpression::MATCH == selected &&
-      KScoringExpression::MATCHCS == selected &&
+  bool isRegExp = (KScoringExpression::MATCH == selected ||
+      KScoringExpression::MATCHCS == selected) &&
       !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
   regExpButton->setEnabled( isRegExp );
 }
@@ -248,7 +248,8 @@
           w = new QLabel( stack ); // empty dummy
           break;
       }
-      stack->addWidget(w,index++);
+      if ( w )
+        stack->addWidget(w,index++);
     }
   }