diff --git a/gpgmeplug/ChangeLog b/gpgmeplug/ChangeLog
index 0c60d16c..220dea96 100644
--- a/gpgmeplug/ChangeLog
+++ b/gpgmeplug/ChangeLog
@@ -2,7 +2,11 @@
 
 	* gpgmeplug.c (signMessage): Implemented warning when signature
 	certificates are about to expire 
-	* cryptplug.h: dito
+	(isEmailInCertificate): Added support for checking whether the
+	signer's email address is contained in his certificate.
+
+	* cryptplug.h: Implemented warning when signature
+	certificates are about to expire
 
 2002-02-27  Marcus Brinkmann  <marcus@g10code.de>
 
diff --git a/gpgmeplug/cryptplug.h b/gpgmeplug/cryptplug.h
index 592432da..b891c127 100644
--- a/gpgmeplug/cryptplug.h
+++ b/gpgmeplug/cryptplug.h
@@ -461,6 +461,13 @@ void setWarnNoCertificate( bool );
 */
 bool warnNoCertificate( void );
 
+/*!
+  \ingroup groupConfigSign
+  \brief Returns true if the specified email address is contained
+  in the specified certificate.
+*/
+bool isEmailInCertificate( const char* email, const char* certificate );
+
 /*! \ingroup groupConfigSign
    \brief Specifies how often the PIN is requested when
             accessing the secret signature key.
diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index 3c73b4c7..2cb067eb 100644
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -343,6 +343,22 @@ bool warnNoCertificate()
   return config.warnNoCertificate;
 }
 
+
+bool isEmailInCertificate( const char* email, const char* certificate )
+{
+    /* PENDING(g10) this function should return true if the email
+       address passed as the first parameter is contained in the
+       certificate passed as the second parameter, and false
+       otherwise. This is used to alert the user if his own email
+       address is not contained in the certificate he uses for
+       signing.
+       Note that the parameter email can be anything that is allowed
+       in a From: line.
+    */
+    return false; // dummy
+}
+
+
 void setNumPINRequests( PinRequests reqMode )
 {
   config.numPINRequests = reqMode;