CVS commit by tilladam: 

More OpenUsability.org suggestions:

- move "mark all as read" to the first position, it is used most
- move the Expire Settings above the Properties


  M +9 -4      kmfoldertree.cpp   1.344


--- kdepim/kmail/kmfoldertree.cpp  #1.343:1.344
@@ -929,4 +929,8 @@ void KMFolderTree::slotContextMenuReques
   if (fti->folder()) folderMenu->insertTitle(fti->folder()->label());
 
+  // Mark all as read is supposedly used often, therefor it is first
+  if ( fti->folder() && !fti->folder()->noContent() )
+      mMainWidget->action("mark_all_as_read")->plug( folderMenu );
+
   if ((!fti->folder() || (fti->folder()->noContent()
     && !fti->parent())))
@@ -969,8 +973,4 @@ void KMFolderTree::slotContextMenuReques
       mMainWidget->action("compact")->plug(folderMenu);
 
-      //mMainWidget->action("expire")->plug(folderMenu);
-      folderMenu->insertItem( i18n("Expire..."), fti,
-                              SLOT( slotShowExpiryProperties() ) );
-
       folderMenu->insertSeparator();
 
@@ -1018,4 +1018,9 @@ void KMFolderTree::slotContextMenuReques
         fti,
         SLOT(assignShortcut()));
+
+    if ( !fti->folder()->noContent() ) {
+      folderMenu->insertItem( i18n("Expire..."), fti,
+                              SLOT( slotShowExpiryProperties() ) );
+    }
     mMainWidget->action("modify")->plug(folderMenu);
   }