diff --git a/dav_submission/views.py b/dav_submission/views.py
index fec4589..58eb657 100644
--- a/dav_submission/views.py
+++ b/dav_submission/views.py
@@ -68,11 +68,16 @@ class ListView(generic.ListView):
                         date_str = mo.group(1)
                         time_str = mo.group(2)
                         zone_str = mo.group(3)
+                        if not zone_str:
+                            zone_str = timezone.get_current_timezone_name()
                         datetime_str = '{} {}'.format(date_str, time_str)
                         timestamp = datetime.datetime.strptime(datetime_str, '%d.%m.%Y %H:%M:%S')
                         tz = pytz.timezone(zone_str)
                         metadata['timestamp'] = tz.localize(timestamp)
                         continue
+                    mo = re.match(r'^Beschreibung:$', line)
+                    if mo is not None:
+                        break
 
             all_metadata[subdir] = metadata