diff --git a/modules/chat.lua b/modules/chat.lua
index 05386b02..783ee83d 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -227,7 +227,13 @@ pfUI:RegisterModule("chat", function ()
       local frame = getglobal("ChatFrame"..i)
       local tab = getglobal("ChatFrame"..i.."Tab")
 
-      frame:SetTimeVisible(tonumber(pfUI_config.chat.global.fadetime))
+
+      if pfUI_config.chat.global.fadeout == "1" then
+        frame:SetFading(true)
+        frame:SetTimeVisible(tonumber(pfUI_config.chat.global.fadetime))
+      else
+        frame:SetFading(false)
+      end
 
       if i == 3 and pfUI_config.chat.right.enable == "1" then
         tab:SetParent(pfUI.chat.right.panelTop)
diff --git a/modules/config.lua b/modules/config.lua
index 402376c0..f6e03f2b 100644
--- a/modules/config.lua
+++ b/modules/config.lua
@@ -151,7 +151,8 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "global",      "border",           ".4,.4,.4,.5")
   pfUI:UpdateConfig("chat",       "global",      "whispermod",       "1")
   pfUI:UpdateConfig("chat",       "global",      "whisper",          "1,.6,1,1")
-  pfUI:UpdateConfig("chat",       "global",      "fadetime",         "86400")
+  pfUI:UpdateConfig("chat",       "global",      "fadeout",          "0")
+  pfUI:UpdateConfig("chat",       "global",      "fadetime",         "300")
 
   pfUI:UpdateConfig("nameplates", nil,           "showcastbar",      "1")
   pfUI:UpdateConfig("nameplates", nil,           "spellname",        "0")
diff --git a/modules/gui.lua b/modules/gui.lua
index 625b799a..0472b85d 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -994,6 +994,7 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Chat Border color:", pfUI_config.chat.global, "border", "color")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Change layout of incoming whispers:", pfUI_config.chat.global, "whispermod", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Color of incoming whispers:", pfUI_config.chat.global, "whisper", "color")
+  pfUI.gui:CreateConfig(pfUI.gui.chat, "Fade old chat messages:", pfUI_config.chat.global, "fadeout", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Time in seconds until the chat gets faded:", pfUI_config.chat.global, "fadetime")
 
   -- nameplates