diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ee1511e..372d186 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -3,6 +3,7 @@
 # verify maildir
 if [ -d /var/mail/working ]; then
 	echo "/var/mail/working exists"
+	chown -r root /var/mail/working
 else
 	maildirmake /var/mail/working
 	echo "to /var/mail/working" > /root/.mailfilter
@@ -11,10 +12,26 @@ fi
 # check for user config fetchmailrc
 if [ -f /config/.fetchmailrc ]; then
 	cp /config/.fetchmailrc /root/.fetchmailrc
+	# ensure maildrop is the MDA
+	if grep --quiet '^mda "/usr/bin/maildrop"' /root/.fetchmailrc; then
+		echo "MDA correctly configured"
+	else
+		if grep --quiet '^mda' /root/.fetchmailrc; then
+			sed -i 's/mda.*/mda "\/usr\/bin\/maildrop"/' /root/.fetchmailrc
+		else
+			echo 'mda "/usr/bin/maildrop"' >> /root/.fetchmailrc
+	fi
 	chmod 0700 /root/.fetchmailrc
 	echo "Installed .fetchmailrc"
 fi
 
+# update CA certificates if necessary from /config/*.crt
+if stat --printf='' /config/*.crt 2>/dev/null
+then
+	cp -v /config/*.crt /usr/local/share/ca-certificates/
+	update-ca-certificates
+fi
+
 if [ "$1" = 'cron' ] || [ "$1" = '/opt/save-attachments.sh' ]; then
 	if [ ! -f /root/.fetchmailrc ]; then
 		echo "Cannot start container without .fetchmailrc"