1 files changed, 6 insertions, 0 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 6f3c4a292..72e4a65d0 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1029,6 +1029,12 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 	    break;
 
 	  case cmdADDPHOTO:
+            if (opt.rfc2440)
+              {
+                tty_printf(
+                   _("This command is not allowed while in OpenPGP mode.\n"));
+                break;
+              }
 	    photo=1;
 	    /* fall through */