diff --git a/mycaldav/views.py b/mycaldav/views.py
index 81404df..78a06c9 100644
--- a/mycaldav/views.py
+++ b/mycaldav/views.py
@@ -5,6 +5,7 @@ from django.views import generic
 from django.template import loader
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.contrib.auth.decorators import login_required
+from django.db.models import Q
 
 
 import caldav as cal
@@ -54,6 +55,7 @@ def view_op_edit_caldav(request, uuid):
     print(uuid)
     object = comm_opMessage.objects.get(pk=uuid)
     object.bDone = True
+    object.dtEnd = datetime.today()
     object.save()
 
     return view_op_caldav(request)
@@ -89,7 +91,13 @@ def view_road_caldav(request):
     return HttpResponse(template.render(context, request))
 @xframe_options_exempt
 def view_op_caldav(request):
-    o_items = comm_opMessage.objects.filter(bDone=False, dtStart__lte= datetime.today() + timedelta(days=1))
+    old_items = comm_opMessage.objects.filter(bDone=False, dtEnd__lte=datetime.today() - timedelta(days=1))
+    for old_item in old_items:
+        old_item.bDone = True
+        old_item.save()
+
+
+    o_items = comm_opMessage.objects.filter(Q(dtStart__lte= datetime.today() + timedelta(days=1)) & ( Q(dtEnd__gte=datetime.today()) | Q(dtEnd__isnull=True)))
     all_items = []
     for item in o_items:
         temp_item = caldav_item()
@@ -97,6 +105,7 @@ def view_op_caldav(request):
         temp_item.name = item.sTitle
         temp_item.desc = item.sDesc
         temp_item.key = item.sKey
+        temp_item.done = item.bDone
         temp_item.str_start_date = str(item.dtStart.day) + "." + str(item.dtStart.month)
         if item.dtEnd != None:
             temp_item.str_end_date = str(item.dtEnd.day) + "." + str(item.dtEnd.month)