diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 6f2a31f..964f508 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -7,6 +7,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "fidget.nvim": { "branch": "legacy", "commit": "2f7c08f45639a64a5c0abcf67321d52c3f499ae6" },
+  "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
   "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
   "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
diff --git a/config/nvim/lua/fschauen/plugins/git-messenger.lua b/config/nvim/lua/fschauen/plugins/git-messenger.lua
new file mode 100644
index 0000000..5b07931
--- /dev/null
+++ b/config/nvim/lua/fschauen/plugins/git-messenger.lua
@@ -0,0 +1,27 @@
+local M = { 'rhysd/git-messenger.vim' }
+
+M.cmd = 'GitMessenger'
+
+M.keys = {
+  { '<leader>gm', '<cmd>GitMessenger<cr>', desc = ' open [m]essenger' },
+}
+
+M.init = function()
+  -- Disable default mappings, as I have my own for lazy-loading.
+  vim.g.git_messenger_no_default_mappings = true
+
+  -- Always move cursor into pop-up window immediately.
+  vim.g.git_messenger_always_into_popup = true
+
+  -- Add a border to the floating window, otherwise it's confusing.
+  vim.g.git_messenger_floating_win_opts = { border = 'single' }
+
+  -- Make the UI a bit more compact by removing margins.
+  vim.g.git_messenger_popup_content_margins = false
+
+  -- Extra arguments passed to `git blame`:
+  -- vim.g.git_messenger_extra_blame_args = '-w'
+end
+
+return M
+