diff --git a/g10/ChangeLog b/g10/ChangeLog
index c8ce0c951..c7a190e60 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-26  Marcus Brinkmann  <marcus@g10code.de>
+
+	* passphrase.c (passphrase_to_dek): Write missing passphrase
+	status message in case of cancellation.
+
 2007-04-16  Werner Koch  <wk@g10code.com>
 
 	* build-packet.c (mpi_write): Made buffer a bit larger.  Reported
diff --git a/g10/passphrase.c b/g10/passphrase.c
index c3d42dc0e..122b251dd 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -627,6 +627,7 @@ passphrase_to_dek (u32 *keyid, int pubkey_algo,
       if (*canceled)
         {
           xfree (pw);
+	  write_status( STATUS_MISSING_PASSPHRASE );
           return NULL;
         }
       if (!pw)
@@ -642,6 +643,7 @@ passphrase_to_dek (u32 *keyid, int pubkey_algo,
                 {
                   xfree (pw);
                   xfree (pw2);
+		  write_status( STATUS_MISSING_PASSPHRASE );
                   return NULL;
                 }
 	      if (!pw2)