2 files changed, 8 insertions, 4 deletions

diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 56c9801..55ac6d4 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -561,39 +561,43 @@ ushort Incidence::doesRecur() const
 QDateTime Incidence::getNextOccurence( const QDateTime& dt, bool* ok ) const
 {
     QDateTime incidenceStart = dt;
     *ok = false;
     if ( doesRecur() ) {
         bool last;
          recurrence()->getPreviousDateTime( incidenceStart , &last );
          int count = 0;
          if ( !last ) {
              while ( !last ) {
                  ++count;
                  incidenceStart = recurrence()->getNextDateTime( incidenceStart, &last );
                  if ( recursOn( incidenceStart.date() ) ) {
                      last = true; // exit while llop
                  } else {
                      if ( last ) { // no alarm on last recurrence
                          return QDateTime ();
                      }
                      int year = incidenceStart.date().year();
                      // workaround for bug in recurrence
                      if ( count == 100 || year < 1980 || year > 5000 ) {
                          return QDateTime ();
                      }
                      incidenceStart = incidenceStart.addSecs( 1 );
                  }
              }
          } else {
              return QDateTime ();
          }
     } else {
         if ( hasStartDate () ) {
             incidenceStart = dtStart(); 
-            
-        } 
+        }
+        if ( type() =="Todo" ) {
+            if ( ((Todo*)this)->hasDueDate() )
+                incidenceStart = ((Todo*)this)->dtDue();
+
+        }
     }
     if ( incidenceStart > dt )
         *ok = true;
     return incidenceStart;
 }
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 64a343c..b36dc1a 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -242,83 +242,83 @@ void IncidenceBase::removeAttendee(const char *n)
       break;
     }
 }
 #endif
 
 void IncidenceBase::clearAttendees()
 {
   if (mReadOnly) return;
   mAttendees.clear();
 }
 
 #if 0
 Attendee *IncidenceBase::getAttendee(const char *n) const
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
     if (qli.current()->getName() == n)
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 #endif
 
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
-    if (qli.current()->email() == email)
+      if (qli.current()->email().lower() == email.lower())
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 
 Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QString& email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   QStringList mails = emails;
   if (!email.isEmpty()) {
     mails.append(email);
   }
   qli.toFirst();
   while (qli) {
     for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) {
-      if (qli.current()->email() == *it)
+        if (qli.current()->email().lower() == (*it).lower())
         return qli.current();
      }
 
     ++qli;
   }
   return 0L;
 }
 
 void IncidenceBase::setDuration(int seconds)
 {
   mDuration = seconds;
   setHasDuration(true);
 }
 
 int IncidenceBase::duration() const
 {
   return mDuration;
 }
 
 void IncidenceBase::setHasDuration(bool b)
 {
   mHasDuration = b;
 }
 
 bool IncidenceBase::hasDuration() const
 {
   return mHasDuration;
 }
 
 void IncidenceBase::setSyncStatus(int stat)
 {
   if (mReadOnly) return;