2 files changed, 9 insertions, 4 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d4d9c0f..d0dbb47 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -358,3 +358,10 @@ void  KOListView::setAlarm()
         if ( qitem->isSelected() ) {
-            sel.append(((KOListViewItem *)qitem));
+            Incidence* inc = ((KOListViewItem *) qitem)->data();
+            if ( inc->type() != "Journal" ) {
+                if ( inc->type() == "Todo" ) {
+                    if ( ((Todo*)inc)->hasDueDate() )
+                      sel.append(((KOListViewItem *)qitem));
+                } else
+                      sel.append(((KOListViewItem *)qitem));
+            }
         }
@@ -368,3 +375,2 @@ void  KOListView::setAlarm()
         inc = item->data();
-        if ( inc->type() != "Journal" ) {
             ++count;
@@ -402,3 +408,2 @@ void  KOListView::setAlarm()
             }
-        }
         temp = item;
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 78004fe..bd5bd12 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -70,3 +70,3 @@ class KOAlarmPrefs : public QDialog
         QWidget *parent = this;
-        mAlarmButton = new QCheckBox(i18n("Set reminder offset to:"),parent);
+        mAlarmButton = new QCheckBox(i18n("Set reminder ON with offset to:"),parent);
         alarmLayout->addWidget(mAlarmButton);