diff --git a/mycaldav/views.py b/mycaldav/views.py
index 54ab8da..566649c 100644
--- a/mycaldav/views.py
+++ b/mycaldav/views.py
@@ -90,6 +90,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)
@@ -125,9 +126,18 @@ def view_road_caldav(request):
     response = formatResponseArray(o_caldav, inverted=True)
     return Response(response["data"], status=response["status"])
 
+
+def close_old_op_message():
+    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()
+
 @api_view(['GET'])
 def view_op_caldav(request):
-    o_items = comm_opMessage.objects.filter(bDone=False, dtStart__lte= datetime.today() + timedelta(days=1))
+    close_old_op_message()
+
+    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()