1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/ui/chat_input/chat_input_controller.vala b/main/src/ui/chat_input/chat_input_controller.vala
index d1c42d35..025834d6 100644
--- a/main/src/ui/chat_input/chat_input_controller.vala
+++ b/main/src/ui/chat_input/chat_input_controller.vala
@@ -25,6 +25,7 @@ public class ChatInputController : Object {
     private ChatTextViewController chat_text_view_controller;
 
     private ContentItem? quoted_content_item = null;
+    private Encryption encryption;
 
     public ChatInputController(ChatInput.View chat_input, StreamInteractor stream_interactor) {
         this.chat_input = chat_input;
@@ -102,7 +103,7 @@ public class ChatInputController : Object {
 
     private void on_encryption_changed(Encryption encryption) {
         reset_input_field_status();
-
+        this.encryption = encryption;
         if (encryption == Encryption.NONE) return;
 
         Application app = GLib.Application.get_default() as Application;
@@ -127,6 +128,9 @@ public class ChatInputController : Object {
     }
 
     private void send_text() {
+        // Double check GPG keys before sending in case of expired / revoked keys while Dino is in use
+        if (this.encryption == Encryption.PGP) on_encryption_changed(this.encryption);
+
         // Don't do anything if we're in a NO_SEND state. Don't clear the chat input, don't send.
         if (input_field_status.input_state == Plugins.InputFieldStatus.InputState.NO_SEND) {
             chat_input.highlight_state_description();