diff --git a/api/config.lua b/api/config.lua
index 2391a9d4..c8669b12 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -672,6 +672,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "global",      "tabdock",          "0")
   pfUI:UpdateConfig("chat",       "global",      "tabmouse",         "0")
   pfUI:UpdateConfig("chat",       "global",      "chatflash",        "1")
+  pfUI:UpdateConfig("chat",       "global",      "maxlines",         "128")
   pfUI:UpdateConfig("chat",       "global",      "frameshadow",      "1")
   pfUI:UpdateConfig("chat",       "global",      "custombg",         "0")
   pfUI:UpdateConfig("chat",       "global",      "background",       ".2,.2,.2,.5")
diff --git a/modules/chat.lua b/modules/chat.lua
index e3a29882..317bcc3d 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -359,6 +359,10 @@ pfUI:RegisterModule("chat", "vanilla:tbc", function ()
         frame:SetFading(false)
       end
 
+      if C.chat.global.maxlines ~= "128" then
+        frame:SetMaxLines(tonumber(C.chat.global.maxlines) or 128)
+      end
+
       if i == 3 and C.chat.right.enable == "1" then
         -- Loot & Spam
         local bottompadding = pfUI.panel and pfUI.panel.right:IsShown() and not pfUI_config.position["pfPanelRight"] and panelheight or default_border
diff --git a/modules/gui.lua b/modules/gui.lua
index af1f28ae..bd44b29a 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -2190,6 +2190,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
       CreateConfig(nil, T["Enable Custom Incoming Whispers Layout"], C.chat.global, "whispermod", "checkbox")
       CreateConfig(nil, T["Incoming Whispers Color"], C.chat.global, "whisper", "color")
       CreateConfig(nil, T["Enable Sticky Chat"], C.chat.global, "sticky", "checkbox")
+      CreateConfig(nil, T["Maximum Number Of Chat Lines"], C.chat.global, "maxlines")
       CreateConfig(nil, T["Enable Chat Fade"], C.chat.global, "fadeout", "checkbox")
       CreateConfig(nil, T["Seconds Before Chat Fade"], C.chat.global, "fadetime")
       CreateConfig(nil, T["Mousewheel Scroll Speed"], C.chat.global, "scrollspeed")