diff --git a/moderncvbodyvi.sty b/moderncvbodyvi.sty
index 3b13b1b..8a765ce 100644
--- a/moderncvbodyvi.sty
+++ b/moderncvbodyvi.sty
@@ -165,7 +165,8 @@
   \setlength{\parskip}{6\p@}}
 
 \renewcommand*{\makeletterclosing}{
-  \@closing\\[3em]%
+  \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+  \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
   {\bfseries\@firstname~\@lastname}%
   \ifthenelse{\isundefined{\@enclosure}}{}{%
     \\%
diff --git a/moderncvheadvii.sty b/moderncvheadvii.sty
index 9619e62..c01a232 100644
--- a/moderncvheadvii.sty
+++ b/moderncvheadvii.sty
@@ -209,6 +209,8 @@
   \hfill% US style
 %  \\[1em]% UK style
   \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+  % optional subject
+  \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[3em]}}
   % opening
   \raggedright%
   \@opening\\[1.5em]%