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
@@ -137,18 +137,18 @@ void TaskEditorOverView::load( const OTodo& todo )
 
     // Priority
     cmbPriority->setCurrentItem( todo.priority() - 1 );
 
     // Category
     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() );
 
 }
 
 void TaskEditorOverView::save( OTodo &todo )
 {
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
@@ -174,17 +174,17 @@ TaskEditorStatus::~TaskEditorStatus()
 }
 
 void TaskEditorStatus::load( const OTodo &todo )
 {
     QDate date = QDate::currentDate();
     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 );
 
     // Progress
     cmbProgress->setCurrentItem( todo.progress() / 20 );
     
     // Start date
@@ -211,17 +211,17 @@ void TaskEditorStatus::load( const OTodo &todo )
     {
         m_comp = todo.completedDate();
         btnComp->setText( TimeString::longDateString( m_comp ) );
     }
     else
         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 );
 
     // Maintainer - not implemented yet
 }
 
 void TaskEditorStatus::save( OTodo &todo )