diff --git a/optional/fetchmail/Dockerfile b/optional/fetchmail/Dockerfile
index 0b3d4375..068a5dce 100644
--- a/optional/fetchmail/Dockerfile
+++ b/optional/fetchmail/Dockerfile
@@ -13,10 +13,7 @@ RUN apk add --no-cache fetchmail ca-certificates openssl \
  && pip3 install requests
 
 RUN mkdir -p /data
-RUN chown fetchmail:fetchmail /data
 
 COPY fetchmail.py /fetchmail.py
 
-USER fetchmail
-
-CMD ["/fetchmail.py"]
+CMD ["/fetchmail.py"]
\ No newline at end of file
diff --git a/optional/fetchmail/fetchmail.py b/optional/fetchmail/fetchmail.py
index 3752c395..f3b65fc0 100755
--- a/optional/fetchmail/fetchmail.py
+++ b/optional/fetchmail/fetchmail.py
@@ -13,7 +13,7 @@ import traceback
 
 FETCHMAIL = """
 fetchmail -N \
-    --idfile /data/.fetchids \
+    --idfile /data/.fetchids --uidl \
     --sslcertck --sslcertpath /etc/ssl/certs \
     -f {}
 """