diff --git a/modules/chat.lua b/modules/chat.lua
index 17f400a2..c26e7410 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -219,6 +219,8 @@ pfUI:RegisterModule("chat", function ()
         end
 
         for i=1, NUM_CHAT_WINDOWS do
+          getglobal("ChatFrame"..i):SetTimeVisible(tonumber(pfUI_config.chat.global.fadetime))
+
           for j,v in ipairs({getglobal("ChatFrame" .. i .. "Tab"):GetRegions()}) do
             if j==5 then v:SetTexture(0,0,0,0) end
             v:SetHeight(pfUI_config.global.font_size+default_border*2)
diff --git a/modules/config.lua b/modules/config.lua
index 5d30c32b..3966f925 100644
--- a/modules/config.lua
+++ b/modules/config.lua
@@ -137,6 +137,8 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "global",      "custombg",         "0")
   pfUI:UpdateConfig("chat",       "global",      "background",       ".2,.2,.2,.5")
   pfUI:UpdateConfig("chat",       "global",      "whisper",          "1,.6,1,1")
+  pfUI:UpdateConfig("chat",       "global",      "fadetime",         "86400")
+
   pfUI:UpdateConfig("nameplates", nil,           "showcastbar",      "1")
   pfUI:UpdateConfig("nameplates", nil,           "spellname",        "0")
   pfUI:UpdateConfig("nameplates", nil,           "showdebuffs",      "0")
diff --git a/modules/gui.lua b/modules/gui.lua
index 42a3d78f..03b74bdc 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -981,6 +981,7 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Use custom background:", pfUI_config.chat.global, "custombg", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Background color:", pfUI_config.chat.global, "background", "color")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Color of incoming whispers:", pfUI_config.chat.global, "whisper", "color")
+  pfUI.gui:CreateConfig(pfUI.gui.chat, "Time in seconds until the chat gets faded:", pfUI_config.chat.global, "fadetime")
 
   -- nameplates
   pfUI.gui.nameplates = pfUI.gui:CreateConfigTab("Nameplates")