diff --git a/test/repl/test-repl b/test/repl/test-repl
index 5d0d7de..c406b00 100755
--- a/test/repl/test-repl
+++ b/test/repl/test-repl
@@ -28,0 +29 @@ actual=$MH_TEST_DIR/Mail/draft
+start_test -help
@@ -64,0 +66 @@ check "$expected" "$actual"
+start_test -version
@@ -71,0 +74 @@ esac
+start_test 'unknown switch'
@@ -74,0 +78 @@ run_test "repl -nonexistent" 'repl: -nonexistent unknown'
+start_test 'with no switches'
@@ -80,0 +85 @@ printf 'Local-Mailbox: address@hidden' >> "$MH"
+start_test '-cc me'
@@ -97,0 +103 @@ check $expected $actual
+start_test '-nocc me'
@@ -114 +120,2 @@ check $expected $actual
-# check -cc me with Local- and Alternate-Mailbox addtions, Bug #36635:
+# check -cc me with Local- and Alternate-Mailbox addtions, Bug #36635
+start_test '-cc me with Local- and Alternate-Mailbox addtions, Bug #36635'
@@ -135 +142,2 @@ check $expected $actual
-# check -nocc me with Local- and Alternate-Mailbox addtions, Bug #36635:
+# check -nocc me with Local- and Alternate-Mailbox addtions, Bug #36635
+start_test '-nocc me with Local- and Alternate-Mailbox addtions, Bug #36635'
@@ -154,0 +163 @@ check $expected $actual
+start_test 'quoting of local part of invalid address, Bug #26780'
@@ -184,0 +194,47 @@ check $expected $actual
+# check that Fcc: header isn't propagated
+start_test "Fcc: header isn't propagated"
+form="${MH_TEST_DIR}/$$.components"
+cat > $form <<'EOF'
+From: address@hidden
+%<{from}%(void(width))%(putaddr To: )%>
+Fcc:%<{fcc} %{fcc}%>
+Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
+--------
+EOF
+cat > $expected <<EOF
+From: address@hidden
+To: address@hidden
+Fcc:
+Subject: Re: suppress Fcc:
+--------
+EOF
+cat > `mhpath new`<<EOF
+From: address@hidden
+To: address@hidden
+Fcc: +mischievous
+Subject: suppress Fcc:
+--------
+EOF
+
+run_prog repl -form "${form}" -nowhatnowproc last
+check "${expected}" "${actual}"
+
+
+# check -fcc with Fcc: in replied-to message
+start_test '-fcc with Fcc: in replied-to message'
+form="${MH_TEST_DIR}/$$.components"
+cat > $expected <<EOF
+From: address@hidden
+To: address@hidden
+Fcc: +myoutbox
+Subject: Re: suppress Fcc:
+--------
+EOF
+
+run_prog repl -fcc +myoutbox -form "${form}" -nowhatnowproc last
+check "${expected}" "${actual}"
+
+test "${failed:-0}" -eq 0 && rm "${form}"
+
+
+finish_test