Merged revisions 965019 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r965019 | tmcguire | 2009-05-07 21:59:01 +0200 (Thu, 07 May 2009) | 11 lines
  
  Merged revisions 965008 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r965008 | tmcguire | 2009-05-07 21:50:39 +0200 (Thu, 07 May 2009) | 4 lines
    
    Allow the user to reply to mails in the sent-mail folder, as often requested.
    kolab/issue2150
    BUG: 190105
  ........
................

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

kmmainwidget.cpp

@@ -3455,10 +3455,7 @@ void KMMainWidget::slotMsgPopup( KMMessage &msg, const KUrl &aUrl, const QPoint
     if ( mFolder->isTemplates() ) {
       menu->addAction( mUseAction );
     } else {
-
-      if ( !mFolder->isSent() ) {
-        menu->addAction( mMsgActions->replyMenu() );
-      }
+      menu->addAction( mMsgActions->replyMenu() );
       menu->addAction( mMsgActions->forwardMenu() );
     }
     menu->addAction(editAction());

messageactions.cpp

@@ -200,8 +200,7 @@ void MessageActions::updateActions()
 {
   bool singleMsg = (mCurrentMessage != 0);
   if ( mCurrentMessage && mCurrentMessage->parent() ) {
-    if ( mCurrentMessage->parent()->isSent() ||
-         mCurrentMessage->parent()->isTemplates() )
+    if ( mCurrentMessage->parent()->isTemplates() )
       singleMsg = false;
   }
   const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage;

messagelistview/widget.cpp

@@ -618,8 +618,7 @@ void Widget::viewMessageListContextPopupRequest( const QList< Core::MessageItem
     menu.addAction( mMainWidget->useAction() );
   } else {
     // show most used actions
-    if( !folder()->isSent() )
-      menu.addAction( mMainWidget->messageActions()->replyMenu() );
+    menu.addAction( mMainWidget->messageActions()->replyMenu() );
     menu.addAction( mMainWidget->messageActions()->forwardMenu() );
     if( mMainWidget->sendAgainAction()->isEnabled() )
       menu.addAction( mMainWidget->sendAgainAction() );