1 files changed, 10 insertions, 3 deletions

diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index d8b58b6..61e7dc4 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -163,42 +163,49 @@ void OpieMail::displayMail()
     }
 }
 
 void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail.getFrom() + " - " + mail.getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         mail.Wrapper()->deleteMail( mail );
         folderView->refreshCurrent();
     }
 }
 
 void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 {
+    if (!mailView->currentItem()) return;
+    RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
     /* just the RIGHT button - or hold on pda */
     if (button!=2) {return;}
     qDebug("Event right/hold");
     if (!item) return;
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
-        m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
-        m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
-        m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail()));
+        if (mail.Wrapper()->getType()==MAILLIB::A_NNTP) {
+            m->insertItem(tr("Read this posting"),this,SLOT(displayMail()));
+//            m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail()));
+        } else {
+            m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
+            m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
+            m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail()));
+        }
         m->setFocus();
         m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
         delete m;
     }
 }
 
 void OpieMail::slotShowFolders( bool show )
 {
     qDebug( "Show Folders" );
     if ( show && folderView->isHidden() )
     {
         qDebug( "-> showing" );
         folderView->show();
     }
     else if ( !show && !folderView->isHidden() )
     {