diff --git a/apps/gui/firefox.nix b/apps/gui/firefox.nix
index f654e02..da07e77 100644
--- a/apps/gui/firefox.nix
+++ b/apps/gui/firefox.nix
@@ -41,6 +41,7 @@
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         bitwarden
         clearurls
+        mailvelope
         multi-account-containers
         refined-github
         ublock-origin
diff --git a/apps/nogui/gpg.nix b/apps/nogui/gpg.nix
index 8a6f77d..119a01c 100644
--- a/apps/nogui/gpg.nix
+++ b/apps/nogui/gpg.nix
@@ -2,6 +2,16 @@
   key = "0xB853ADA5DA7BBF7A";
 in {
   home.packages = with pkgs; [pinentry];
+  home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = {
+    enable = true;
+    text = builtins.toJSON {
+      name = "gpgmejson";
+      description = "JavaScript binding for GnuPG";
+      path = pkgs.gpgme.dev + /bin/gpgme-json;
+      type = "stdio";
+      allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"];
+    };
+  };
   programs.gpg = {
     enable = true;
     settings = {
@@ -15,6 +25,7 @@ in {
       verify-options = "show-uid-validity";
       with-fingerprint = true;
       with-key-origin = true;
+      keyserver = "hkps://keys.openpgp.org";
     };
   };
   services.gpg-agent = {