diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index b3d47f0..9d28555 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -29,9 +29,12 @@ ENV BITMESSAGE_SEED_PHRASE=bitmessage_seed_phrase
 ENV BITMESSAGE_SEED_ADDRESSES=1
 ENV BITMESSAGE_API_PORT=8442
 ENV BITMESSAGE_TTL=172800
+ENV BITMESSAGE_STOPRESENDINGAFTERXDAYS=30
 
-ENV HOME /home/bitmessage
-ENV BITMESSAGE_HOME ${HOME}
+ENV USER_UID=2000
+ENV USER_GID=2000
+ENV HOME=/home/bitmessage
+ENV BITMESSAGE_HOME=${HOME}
 
 COPY --from=0 /usr/local/ /usr/local/
 
@@ -41,7 +44,8 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Create a user
-RUN useradd --create-home --home-dir $HOME bitmessage
+RUN addgroup --gid $USER_GID bitmessage ;\
+	useradd --uid $USER_UID --gid $USER_GID -m -d $HOME bitmessage
 
 WORKDIR ${HOME}
 USER bitmessage
@@ -57,6 +61,7 @@ CMD sed -i -e "s|\(apiinterface = \).*|\10\.0\.0\.0|g" \
         -e "s|\(apiport = \).*|\1$BITMESSAGE_API_PORT|g" \
         -e "s|\(apienabled = \).*|\1True|g" \
         -e "s|\(ttl = \).*|\1$BITMESSAGE_TTL|g" \
+        -e "s|\(stopresendingafterxdays = \).*|\1$BITMESSAGE_STOPRESENDINGAFTERXDAYS|g" \
         -e "s|\(udp = \).*|\1False|g" keys.dat \
         && exec pybitmessage -d
 
diff --git a/README.md b/README.md
index d99483b..df90612 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ services:
       - BITMESSAGE_SEED_PHRASE=bitmessage_seed_phrase
       - BITMESSAGE_SEED_ADDRESSES=1
       - BITMESSAGE_TTL=172800
+      - BITMESSAGE_STOPRESENDINGAFTERXDAYS=60
     ports:
       - 8442:8442
 ```
@@ -36,6 +37,7 @@ docker run -d \
   -e BITMESSAGE_SEED_PHRASE=bitmessage_seed_phrase \
   -e BITMESSAGE_SEED_ADDRESSES=1 \
   -e BITMESSAGE_TTL=172800 \
+  -e BITMESSAGE_STOPRESENDINGAFTERXDAYS=60
   -p 8442:8442 \
   bitdeals/pybitmessage
 ```
@@ -52,4 +54,5 @@ Container images are configured using parameters passed at runtime.
 |-e BITMESSAGE_SEED_PHRASE|Create Deterministic Addresses password. Default: `bitmessage_seed_phrase`|
 |-e BITMESSAGE_SEED_ADDRESSES|Number of Deterministic Addresses to generate. Default: `1`|
 |-e BITMESSAGE_TTL|The expiration of newly send messages, in seconds. Default: `172800`|
+|-e BITMESSAGE_STOPRESENDINGAFTERXDAYS|Stop resending unreceived message after X days. Default: `60`|
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e37601..83dadfd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,9 @@ services:
       - BITMESSAGE_API_USER=bitmessage_api_user
       - BITMESSAGE_API_PASSWORD=bitmessage_api_password
       - BITMESSAGE_SEED_PHRASE=bitmessage_seed_phrase
+      - BITMESSAGE_SEED_ADDRESSES=1
+      - BITMESSAGE_TTL=172800
+      - BITMESSAGE_STOPRESENDINGAFTERXDAYS=60
     ports:
       - 8442:8442