change EncryptMessage / DecryptMessage API

protob/messages.proto

@@ -392,9 +392,9 @@ message MessageSignature {
  * @next Failure
  */
 message EncryptMessage {
-	repeated uint32 address_n = 1;				// BIP-32 path to derive the key from master node
-	optional bytes pubkey = 2;				// public key
-	optional bytes message = 3;				// message to encrypt
+	optional bytes pubkey = 1;				// public key
+	optional bytes message = 2;				// message to encrypt
+	optional bool display_only = 3;				// show just on display? (don't send back via wire)
 }
 
 /**
@@ -404,9 +404,7 @@ message EncryptMessage {
  */
 message DecryptMessage {
 	repeated uint32 address_n = 1;				// BIP-32 path to derive the key from master node
-	optional bytes pubkey = 2;				// public key
-	optional bytes message = 3;				// message to decrypt
-	optional bool show_only = 4;				// show just on display? (don't send back via wire)
+	optional bytes message = 2;				// message to decrypt
 }
 
 /**