diff --git a/Scripts/Items/Skill Items/Magical/Spellbook.cs b/Scripts/Items/Skill Items/Magical/Spellbook.cs
index 08be2bd87..cb8a25999 100644
--- a/Scripts/Items/Skill Items/Magical/Spellbook.cs	
+++ b/Scripts/Items/Skill Items/Magical/Spellbook.cs	
@@ -545,14 +545,17 @@ namespace Server.Items
 			else
 				to.Send( new DisplaySpellbook( this ) );
 
-			if ( Core.AOS ) {
+			if ( ObjectPropertyList.Enabled ) {
 				if ( ns.NewSpellbook ) {
 					to.Send( new NewSpellbookContent( this, ItemID, BookOffset + 1, m_Content ) );
 				} else {
-					to.Send( new SpellbookContent( m_Count, BookOffset + 1, m_Content, this ) );
+					if (ns.ContainerGridLines) {
+						to.Send(new SpellbookContent6017(m_Count, BookOffset + 1, m_Content, this));
+					} else {
+						to.Send(new SpellbookContent(m_Count, BookOffset + 1, m_Content, this));
+					}
 				}
-			}
-			else {
+			} else {
 				if ( ns.ContainerGridLines ) {
 					to.Send( new SpellbookContent6017( m_Count, BookOffset + 1, m_Content, this ) );
 				} else {