forward port:

Remove the 'Expire settings..." menu entry since it did not really do that
but showed the 'expire folder now?' dialog (it actually was disabled most
of the time, which probably explans why nobody noticed).  

svn path=/trunk/KDE/kdepim/; revision=463847

kmail_part.rc

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="3" name="kmail_part" >
+<kpartgui version="4" name="kmail_part" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -81,7 +81,6 @@
    <Separator/>
    <Action name="mark_all_as_read" />
    <Separator/>
-   <Action name="expire" />
    <Action name="remove_duplicate_messages" />
    <Separator/>
    <Action name="refresh_folder" />

kmmainwin.rc

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="85" name="kmmainwin" >
+<kpartgui version="86" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -84,7 +84,6 @@
    <Separator/>
    <Action name="mark_all_as_read" />
    <Separator/>
-   <Action name="expire" />
    <Action name="remove_duplicate_messages" />
    <Separator/>
    <Action name="refresh_folder" />