diff -w -b -B -E -r --strip-trailing-cr --ignore-file-name-case --ignore-blank-lines --ignore-tab-expansion kdenetwork-3.1.3/kmail/about/Makefile.in kdenetwork-3.1.3_new/kmail/about/Makefile.in
309c309
< #>- 	  $(AUTOMAKE) --foreign  kmail/about/Makefile
---
> #>- 	  $(AUTOMAKE) --gnu  kmail/about/Makefile
312c312
< 	  $(AUTOMAKE) --foreign  kmail/about/Makefile
---
> 	  $(AUTOMAKE) --gnu  kmail/about/Makefile
484c484
< 	  $(AUTOMAKE) --foreign  kmail/about/Makefile
---
> 	  $(AUTOMAKE) --gnu  kmail/about/Makefile
diff -w -b -B -E -r --strip-trailing-cr --ignore-file-name-case --ignore-blank-lines --ignore-tab-expansion kdenetwork-3.1.3/kmail/accountdialog.cpp kdenetwork-3.1.3_new/kmail/accountdialog.cpp
534a535,536
>     new QCheckBox( i18n("&Use pop filter"), hbox );
>   mPop.filterSizeOnServerCheck =
543c545
<   connect( mPop.filterOnServerCheck, SIGNAL(toggled(bool)),
---
>   connect( mPop.filterSizeOnServerCheck, SIGNAL(toggled(bool)),
825a828
>     mPop.filterSizeOnServerCheck->setChecked( ap.filterSizeOnServer() );
1121a1125
>     epa.setFilterSizeOnServer( mPop.filterSizeOnServerCheck->isChecked() );
diff -w -b -B -E -r --strip-trailing-cr --ignore-file-name-case --ignore-blank-lines --ignore-tab-expansion kdenetwork-3.1.3/kmail/accountdialog.h kdenetwork-3.1.3_new/kmail/accountdialog.h
108a109
>       QCheckBox    *filterSizeOnServerCheck;
diff -w -b -B -E -r --strip-trailing-cr --ignore-file-name-case --ignore-blank-lines --ignore-tab-expansion kdenetwork-3.1.3/kmail/kmacctexppop.cpp kdenetwork-3.1.3_new/kmail/kmacctexppop.cpp
55c55,56
<   if (job) {
---
>    if (job)
>    {
85a87
>    mFilterSizeOnServer = FALSE;
126a129
>    setFilterSizeOnServer(acct->filterSizeOnServer());
134c137,138
<   if (stage == Idle) {
---
>    if (stage == Idle)
>    {
136c140,141
<     if(mAskAgain || mPasswd.isEmpty() || mLogin.isEmpty()) {
---
>       if(mAskAgain || mPasswd.isEmpty() || mLogin.isEmpty())
>       {
147c152,154
<       } else {
---
>          }
>          else
>          {
164c171,172
<   else {
---
>    else
>    {
198a207
>    mFilterSizeOnServer = config.readNumEntry("filter-size-on-server", FALSE);
221a231
>    config.writeEntry("filter-size-on-server", mFilterSizeOnServer);
272a283,288
> void KMAcctExpPop::setFilterSizeOnServer(bool b)
> {
>    mFilterSizeOnServer = b;
> }
> 
> //---------------------------------------------------------------------------
334c350,351
< void KMAcctExpPop::connectJob() {
---
> void KMAcctExpPop::connectJob()
> {
368c385,386
<   while (cur != msgsAwaitingProcessing.end()) {
---
>    while (cur != msgsAwaitingProcessing.end())
>    {
376c394,395
<     if (!addedOk) {
---
>       if (!addedOk)
>       {
383c402,403
<     else {
---
>       else
>       {
414c434,435
< void KMAcctExpPop::startJob() {
---
> void KMAcctExpPop::startJob()
> {
430c451,452
<   if ( url.isMalformed() ) {
---
>    if ( url.isMalformed() )
>    {
497c519,521
<   } else {
---
>    }
>    else
>    {
511c535,536
< void KMAcctExpPop::slotJobFinished() {
---
> void KMAcctExpPop::slotJobFinished()
> {
513c538,539
<   if (stage == List) {
---
>    if (stage == List)
>    {
521c547,548
<   else if (stage == Uidl) {
---
>    else if (stage == Uidl)
>    {
539c566,567
<     if (mFilterOnServer == true) {
---
>       if (mFilterOnServer == true || mFilterSizeOnServer == true)
>       {
541,542c569,570
<       for (hids = idsOfMsgsPendingDownload.begin();
<         hids != idsOfMsgsPendingDownload.end(); hids++) {
---
>          for (hids = idsOfMsgsPendingDownload.begin();hids != idsOfMsgsPendingDownload.end(); hids++)
>          {
546,547c575,576
<           if ((unsigned int)*(lensOfMsgsPendingDownload.at(idx))
< 	      >= mFilterOnServerCheckSize) {
---
>             if (mFilterSizeOnServer == true && (unsigned int)*(lensOfMsgsPendingDownload.at(idx)) >= mFilterOnServerCheckSize)
>             {
548a578,579
>             }
> 
551c582
<                                                     Later));//TODO
---
>                                                     Later));
553c584,585
<             if(headerDeleteUids.contains(headersOnServer.current()->uid())) {
---
>             if(headerDeleteUids.contains(headersOnServer.current()->uid()))
>             {
556c588,589
<             else if(headerDownUids.contains(headersOnServer.current()->uid())) {
---
>             else if(headerDownUids.contains(headersOnServer.current()->uid()))
>             {
559c592,593
<             else if(headerLaterUids.contains(headersOnServer.current()->uid())) {
---
>             else if(headerLaterUids.contains(headersOnServer.current()->uid()))
>             {
562,563c596,597
<           }
<       }
---
> 
> 
568a603
>       }
570,571c605,607
<     // if there are mails which should be checkedc download the headers
<     if ((headersOnServer.count() > 0) && (mFilterOnServer == true)) {
---
>       // if there are mails which should be checked &  download the headers
>       if ((headersOnServer.count() > 0) && (mFilterSizeOnServer == true || mFilterOnServer == true ))
>       {
588c624,625
<     else {
---
>       else
>       {
604c641,642
<   else if (stage == Head) {
---
>    else if (stage == Head)
>    {
614c652,653
<     for (headersOnServer.first(); headersOnServer.current(); headersOnServer.next()) {
---
>       for (headersOnServer.first(); headersOnServer.current(); headersOnServer.next())
>       {
617c656,657
<       switch ( action ) {
---
>          switch ( action )
>          {
622c662
<           kdDebug(5006) << "PopFilterAction = Later" << endl;
---
>                kdDebug(5006) << "PopFilterAction = Later" << endl;;
634c674,675
<       switch ( action ) {
---
>          switch ( action )
>          {
636a678
>                if (mFilterSizeOnServer == true)
637a680,681
>                else if(mFilterOnServer == true)
>                   headersOnServer.current()->setAction(Down);
643a688,689
>                if (mFilterOnServer==true)
>                {
644a691
>                }
652c699,700
<     if (dlgPopup) {
---
>       if (dlgPopup)
>       {
657c705,706
<     for (headersOnServer.first(); headersOnServer.current(); headersOnServer.next()) {
---
>       for (headersOnServer.first(); headersOnServer.current(); headersOnServer.next())
>       {
659c708,709
<           headersOnServer.current()->action() == Later) {
---
>                headersOnServer.current()->action() == Later)
>          {
663c713,714
<         if (idx != -1) {
---
>             if (idx != -1)
>             {
671c722,723
<         if (headersOnServer.current()->action() == Delete) {
---
>             if (headersOnServer.current()->action() == Delete)
>             {
676c728,729
<         else {
---
>             else
>             {
680c733,734
<       else if (headersOnServer.current()->action() == Down) {
---
>          else if (headersOnServer.current()->action() == Down)
>          {
700c754,755
<   else if (stage == Retr) {
---
>    else if (stage == Retr)
>    {
710c765,766
<     if (mLeaveOnServer || idsOfMsgsToDelete.isEmpty()) {
---
>       if (mLeaveOnServer || idsOfMsgsToDelete.isEmpty())
>       {
714c770,771
<     else {
---
>       else
>       {
722c779,780
<   else if (stage == Dele) {
---
>    else if (stage == Dele)
>    {
730c788,789
<   else if (stage == Quit) {
---
>    else if (stage == Quit)
>    {
801c860,861
<   if (next == idsOfMsgsPendingDownload.end()) {
---
>    if (next == idsOfMsgsPendingDownload.end())
>    {
804c864,865
<   else {
---
>    else
>    {
818c879,880
<   if (data.size() == 0) {
---
>    if (data.size() == 0)
>    {
822c884,885
<     else if (stage == Head){
---
>       else if (stage == Head)
>       {
829c892,893
<   if (stage == Retr) {
---
>    if (stage == Retr)
>    {
862c926,927
<   if (stage == Head) {
---
>    if (stage == Head)
>    {
871,872c936,939
<   if (spc > 0) {
<     if (stage == List) {
---
>    if (spc > 0)
>    {
>       if (stage == List)
>       {
882c949,950
<     else { // stage == Uidl
---
>       else
>       { // stage == Uidl
885c953,954
<       if (uidsOfSeenMsgs.contains(uid)) {
---
>          if (uidsOfSeenMsgs.contains(uid))
>          {
888c957,958
<         if (idx != -1) {
---
>             if (idx != -1)
>             {
903c973,974
<   else {
---
>    else
>    {
921,922c992,995
<     if (interactive) {
<       if (headers) { // nothing to be done for headers
---
>       if (interactive)
>       {
>          if (headers)
>          { // nothing to be done for headers
950c1023,1024
<   if (interactive) {
---
>    if (interactive)
>    {
965c1039,1040
< void KMAcctExpPop::slotGetNextHdr(){
---
> void KMAcctExpPop::slotGetNextHdr()
> {
diff -w -b -B -E -r --strip-trailing-cr --ignore-file-name-case --ignore-blank-lines --ignore-tab-expansion kdenetwork-3.1.3/kmail/kmacctexppop.h kdenetwork-3.1.3_new/kmail/kmacctexppop.h
113c113
<    * Shall messages be filter on the server (TRUE)
---
>    * Use POP filter (TRUE)
119a120,126
>    * Shall messages be filter on the server (TRUE)
>    * or not (FALSE).
>    */
>   bool filterSizeOnServer(void) const { return mFilterSizeOnServer; }
>   virtual void setFilterSizeOnServer(bool);
> 
>   /**
173a181
>   bool    mFilterSizeOnServer;