diff --git a/firmware/protob/messages.options b/firmware/protob/messages.options
index 3ead3da1c9..2342ca2b8e 100644
--- a/firmware/protob/messages.options
+++ b/firmware/protob/messages.options
@@ -62,6 +62,7 @@ MessageSignature.signature		max_size:65
 EncryptMessage.pubkey			max_size:65
 EncryptMessage.message			max_size:1024
 EncryptMessage.address_n		max_count:8
+EncryptMessage.coin_name		max_size:17
 
 DecryptMessage.address_n		max_count:8
 DecryptMessage.message			max_size:1024
diff --git a/firmware/protob/messages.pb.c b/firmware/protob/messages.pb.c
index 5a1965a045..1b51ed7241 100644
--- a/firmware/protob/messages.pb.c
+++ b/firmware/protob/messages.pb.c
@@ -9,6 +9,7 @@ const uint32_t ResetDevice_strength_default = 128u;
 const char ResetDevice_language_default[17] = "english";
 const char RecoveryDevice_language_default[17] = "english";
 const char SignMessage_coin_name_default[17] = "Bitcoin";
+const char EncryptMessage_coin_name_default[17] = "Bitcoin";
 const char EstimateTxSize_coin_name_default[17] = "Bitcoin";
 const char SignTx_coin_name_default[17] = "Bitcoin";
 const char SimpleSignTx_coin_name_default[17] = "Bitcoin";
@@ -211,11 +212,12 @@ const pb_field_t MessageSignature_fields[3] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t EncryptMessage_fields[5] = {
+const pb_field_t EncryptMessage_fields[6] = {
     PB_FIELD2(  1, BYTES   , OPTIONAL, STATIC  , FIRST, EncryptMessage, pubkey, pubkey, 0),
     PB_FIELD2(  2, BYTES   , OPTIONAL, STATIC  , OTHER, EncryptMessage, message, pubkey, 0),
     PB_FIELD2(  3, BOOL    , OPTIONAL, STATIC  , OTHER, EncryptMessage, display_only, message, 0),
     PB_FIELD2(  4, UINT32  , REPEATED, STATIC  , OTHER, EncryptMessage, address_n, display_only, 0),
+    PB_FIELD2(  5, STRING  , OPTIONAL, STATIC  , OTHER, EncryptMessage, coin_name, address_n, &EncryptMessage_coin_name_default),
     PB_LAST_FIELD
 };
 
diff --git a/firmware/protob/messages.pb.h b/firmware/protob/messages.pb.h
index 2849fffe9b..ac41e98498 100644
--- a/firmware/protob/messages.pb.h
+++ b/firmware/protob/messages.pb.h
@@ -227,6 +227,8 @@ typedef struct _EncryptMessage {
     bool display_only;
     size_t address_n_count;
     uint32_t address_n[8];
+    bool has_coin_name;
+    char coin_name[17];
 } EncryptMessage;
 
 typedef struct {
@@ -513,6 +515,7 @@ extern const uint32_t ResetDevice_strength_default;
 extern const char ResetDevice_language_default[17];
 extern const char RecoveryDevice_language_default[17];
 extern const char SignMessage_coin_name_default[17];
+extern const char EncryptMessage_coin_name_default[17];
 extern const char EstimateTxSize_coin_name_default[17];
 extern const char SignTx_coin_name_default[17];
 extern const char SimpleSignTx_coin_name_default[17];
@@ -550,6 +553,7 @@ extern const char SimpleSignTx_coin_name_default[17];
 #define EncryptMessage_message_tag               2
 #define EncryptMessage_display_only_tag          3
 #define EncryptMessage_address_n_tag             4
+#define EncryptMessage_coin_name_tag             5
 #define Entropy_entropy_tag                      1
 #define EntropyAck_entropy_tag                   1
 #define EstimateTxSize_outputs_count_tag         1
@@ -663,7 +667,7 @@ extern const pb_field_t WordAck_fields[2];
 extern const pb_field_t SignMessage_fields[4];
 extern const pb_field_t VerifyMessage_fields[4];
 extern const pb_field_t MessageSignature_fields[3];
-extern const pb_field_t EncryptMessage_fields[5];
+extern const pb_field_t EncryptMessage_fields[6];
 extern const pb_field_t DecryptMessage_fields[3];
 extern const pb_field_t CipherKeyValue_fields[7];
 extern const pb_field_t EstimateTxSize_fields[4];
@@ -713,7 +717,7 @@ extern const pb_field_t DebugLinkLog_fields[4];
 #define SignMessage_size                         326
 #define VerifyMessage_size                       363
 #define MessageSignature_size                    104
-#define EncryptMessage_size                      1144
+#define EncryptMessage_size                      1163
 #define DecryptMessage_size                      1075
 #define CipherKeyValue_size                      1340
 #define EstimateTxSize_size                      31
diff --git a/trezor-common b/trezor-common
index e2dab40398..71a02eb83d 160000
--- a/trezor-common
+++ b/trezor-common
@@ -1 +1 @@
-Subproject commit e2dab40398da63becf0e815c9fece141d2043d2e
+Subproject commit 71a02eb83dfa4a5f0543743bc8fcfbd74fc0b7d0