1 files changed, 14 insertions, 7 deletions

diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 3cfd1ee..2d66fc9 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -4,35 +4,38 @@
 #include "logindialog.h"
 #include <libetpan/libetpan.h>
 
 #include <opie2/odebug.h>
 #include <qpe/global.h>
 #include <qfile.h>
+#include <qmessagebox.h>
 
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 
 using namespace Opie::Core;
 POP3wrapper::POP3wrapper( POP3account *a )
 : Genericwrapper() {
     account = a;
     m_pop3 = NULL;
     msgTempName = a->getFileName()+"_msg_cache";
     last_msg_id = 0;
+    m_maxsize = account->getMaxSize();
+    m_checksize = account->getCheckMaxSize();
 }
 
 POP3wrapper::~POP3wrapper() {
     logout();
     QFile msg_cache(msgTempName);
     if (msg_cache.exists()) {
         msg_cache.remove();
     }
 }
 
 void POP3wrapper::pop3_progress( size_t current, size_t maximum ) {
-    odebug << "POP3: " << current << " of " << maximum << "" << oendl; 
+    odebug << "POP3: " << current << " of " << maximum << "" << oendl;
 }
 
 RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     int err = MAILPOP3_NO_ERROR;
     char *message = 0;
     size_t length = 0;
@@ -42,15 +45,19 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     login();
     if ( !m_pop3 ) {
         return body;
     }
 
     mailmessage * mailmsg;
-    if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
-        odebug << "Message to large: " << mail->Msgsize() << "" << oendl; 
-        return body;
+    if (mail->Msgsize()/1024>m_maxsize && m_checksize && mail->getNumber()!=last_msg_id) {
+        QString quest = QString(tr("Download mail?\nIt is %1 kByte but your limit is %2 kByte")).arg(mail->Msgsize()/1024).arg(m_maxsize);
+        int yesno = QMessageBox::warning(0,tr("Download message"),
+            quest,tr("Yes"),tr("No"),QString::null,0,1);
+        odebug << "Message to large: " << mail->Msgsize() << "" << oendl;
+        if (yesno==1)
+            return body;
     }
 
     QFile msg_cache(msgTempName);
 
     cleanMimeCache();
 
@@ -128,13 +135,13 @@ void POP3wrapper::login()
         if ( QDialog::Accepted == login.exec() ) {
             // ok
             user = login.getUser().latin1();
             pass = login.getPassword().latin1();
         } else {
             // cancel
-            odebug << "POP3: Login canceled" << oendl; 
+            odebug << "POP3: Login canceled" << oendl;
             return;
         }
     } else {
         user = account->getUser().latin1();
         pass = account->getPassword().latin1();
     }
@@ -160,13 +167,13 @@ void POP3wrapper::login()
     pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN,
                           (char*)user,(char*)pass,0,0,0);
 
 
     err = mailstorage_connect(m_pop3);
     if (err != MAIL_NO_ERROR) {
-        odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl; 
+        odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl;
         Global::statusMessage(tr("Error initializing folder"));
         mailstorage_free(m_pop3);
         m_pop3 = 0;
     } else {
         mailsession * session = m_pop3->sto_session;
         mailpop3 * mail =  ( (  pop3_session_state_data * )session->sess_data )->pop3_session;
@@ -234,13 +241,13 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
     target_stat.message_recent = 0;
     if (!m_pop3)
         return;
     int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count,
                                       &target_stat.message_recent,&target_stat.message_unseen);
     if (r != MAIL_NO_ERROR) {
-        odebug << "error getting folter status." << oendl; 
+        odebug << "error getting folter status." << oendl;
     }
 }
 
 encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) {
     char*target=0;
     size_t length=0;