diff --git a/docker/devserver b/docker/devserver
new file mode 100755
index 000000000..add4534fa
--- /dev/null
+++ b/docker/devserver
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+version=0.10
+program=${0##*/}
+progdir=${0%/*}
+if [ "$progdir" = "$program" ]; then progdir="."; fi
+if [ "$progdir" = "." ]; then progdir="$PWD"; fi
+parent=$(dirname $progdir)
+if [ "$parent" = "." ]; then parent="$PWD"; fi
+
+# ----------------------------------------------------------------------
+
+$progdir/run ietf/manage.py runserver 0.0.0.0:8000
+
+
diff --git a/docker/mailserver b/docker/mailserver
new file mode 100755
index 000000000..b4d8af9e7
--- /dev/null
+++ b/docker/mailserver
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+version=0.10
+program=${0##*/}
+progdir=${0%/*}
+if [ "$progdir" = "$program" ]; then progdir="."; fi
+if [ "$progdir" = "." ]; then progdir="$PWD"; fi
+parent=$(dirname $progdir)
+if [ "$parent" = "." ]; then parent="$PWD"; fi
+
+# ----------------------------------------------------------------------
+
+$progdir/run python -m smtpd -n -c DebuggingServer localhost:2025
diff --git a/docker/run b/docker/run
index 83e2f83a0..d6694d9d5 100755
--- a/docker/run
+++ b/docker/run
@@ -184,7 +184,7 @@ image=$(docker ps | grep "$REPO:$TAG" | awk '{ print $1 }')
 if [ "$image" ]; then
     if [ "$*" ]; then
         echo "Running 'cd ~/${parent#$HOME/}; $*'"
-	docker exec -u $WHO $image bash -c "cd ~/${parent#$HOME/}; $*"
+	docker exec -u $WHO -t $image bash -c "cd ~/${parent#$HOME/}; $*"
     else
 	docker exec -u $WHO -ti $image bash
     fi
diff --git a/docker/settings_local.py b/docker/settings_local.py
index 208d312da..6e327ba44 100644
--- a/docker/settings_local.py
+++ b/docker/settings_local.py
@@ -21,3 +21,7 @@ IDSUBMIT_STAGING_PATH = "test/staging/"
 INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
 
 AGENDA_PATH = 'test/data/proceedings/'
+
+USING_DEBUG_EMAIL_SERVER=True
+EMAIL_HOST='localhost'
+EMAIL_PORT=2025