2 files changed, 4 insertions, 4 deletions

diff --git a/core/pim/todo/taskeditoroverview.cpp b/core/pim/todo/taskeditoroverview.cpp
index 92408ba..9a8abea 100644
--- a/core/pim/todo/taskeditoroverview.cpp
+++ b/core/pim/todo/taskeditoroverview.cpp
@@ -142,8 +142,8 @@ void TaskEditorOverView::load( const OTodo& todo )
     cmbCategory->setCategories( todo.categories(), "Todo List", tr( "Todo List" ) );
 
     // Recurrence
-    ckbRecurrence->setChecked( todo.recurrence().doesRecur() );
-    emit recurranceEnabled( todo.recurrence().doesRecur() );
+    ckbRecurrence->setChecked( todo.hasRecurrence() );
+    emit recurranceEnabled( todo.hasRecurrence() );
 
     // Notes
     mleNotes->setText( todo.description() );
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index b11fdab..4331877 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -179,7 +179,7 @@ void TaskEditorStatus::load( const OTodo &todo )
     QString str = TimeString::longDateString( date );
 
     // Status
-    int state = todo.state().state();
+    int state = todo.hasState()? todo.state().state() : OPimState::NotStarted;
     if ( state == OPimState::Undefined )
         state = OPimState::NotStarted;
     cmbStatus->setCurrentItem( state );
@@ -216,7 +216,7 @@ void TaskEditorStatus::load( const OTodo &todo )
         btnComp->setText( str );
 
     // Maintainer Mode
-    state = todo.maintainer().mode();
+    state = todo.hasMaintainer() ? todo.maintainer().mode() : OPimMaintainer::Nothing;
     if ( state == OPimMaintainer::Undefined )
         state = OPimMaintainer::Nothing;
     cmbMaintMode->setCurrentItem( state );