diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/abilities/AbilitiesComponents.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/abilities/AbilitiesComponents.java
index a9688812f..6446e052e 100644
--- a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/abilities/AbilitiesComponents.java
+++ b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/abilities/AbilitiesComponents.java
@@ -6,12 +6,12 @@
 import com.archyx.slate.menu.ActiveMenu;
 import dev.aurelium.auraskills.api.ability.Ability;
 import dev.aurelium.auraskills.api.ability.AbstractAbility;
-import dev.aurelium.auraskills.api.mana.ManaAbilities;
 import dev.aurelium.auraskills.api.mana.ManaAbility;
+import dev.aurelium.auraskills.api.util.NumberUtil;
 import dev.aurelium.auraskills.bukkit.AuraSkills;
 import dev.aurelium.auraskills.bukkit.menus.AbstractComponent;
+import dev.aurelium.auraskills.common.ability.AbilityUtil;
 import dev.aurelium.auraskills.common.user.User;
-import dev.aurelium.auraskills.api.util.NumberUtil;
 import dev.aurelium.auraskills.common.util.math.RomanNumber;
 import dev.aurelium.auraskills.common.util.text.Replacer;
 import dev.aurelium.auraskills.common.util.text.TextUtil;
@@ -74,15 +74,18 @@ public <T> String onPlaceholderReplace(String placeholder, Player player, Active
             Locale locale = plugin.getUser(player).getLocale();
             if (placeholder.equals("desc")) {
                 User user = plugin.getUser(player);
+                String format = activeMenu.getFormat("desc_upgrade_value");
                 if (context instanceof Ability ability) {
+                    int level = user.getAbilityLevel(ability);
                     return TextUtil.replace(ability.getDescription(locale),
-                            "{value}", getUpgradeValue(ability, user, activeMenu),
-                            "{value_2}", getUpgradeValue2(ability, user, activeMenu));
+                            "{value}", AbilityUtil.getUpgradeValue(ability, level, format),
+                            "{value_2}", AbilityUtil.getUpgradeValue2(ability, level, format));
                 } else if (context instanceof ManaAbility manaAbility) {
+                    int level = user.getManaAbilityLevel(manaAbility);
                     return TextUtil.replace(manaAbility.getDescription(locale),
-                            "{value}", getUpgradeValue(manaAbility, user, activeMenu),
+                            "{value}", AbilityUtil.getUpgradeValue(manaAbility, level, format),
                             "{haste_level}", String.valueOf(manaAbility.optionInt("haste_level", 10)),
-                            "{duration}", getUpgradeDuration(manaAbility, user, activeMenu));
+                            "{duration}", AbilityUtil.getUpgradeDuration(manaAbility, level, format));
                 }
             }
             return replaceMenuMessage(placeholder, player, activeMenu, new Replacer()
@@ -101,46 +104,6 @@ private int getNextUpgradeLevel(AbstractAbility ability, User user) {
             return unlock + levelUp * user.getAbstractAbilityLevel(ability);
         }
 
-        private String getCurrentValue(Ability ability, User user) {
-            return NumberUtil.format1(ability.getValue(user.getAbilityLevel(ability)));
-        }
-
-        private String getCurrentValue2(Ability ability, User user) {
-            return NumberUtil.format1(ability.getSecondaryValue(user.getAbilityLevel(ability)));
-        }
-
-        private String getUpgradeValue(Ability ability, User user, ActiveMenu activeMenu) {
-            String currentValue = getCurrentValue(ability, user);
-            String nextValue = NumberUtil.format1(ability.getValue(user.getAbilityLevel(ability) + 1));
-            return TextUtil.replace(activeMenu.getFormat("desc_upgrade_value"),
-                    "{current}", currentValue,
-                    "{next}", nextValue);
-        }
-
-        private String getUpgradeValue2(Ability ability, User user, ActiveMenu activeMenu) {
-            String currentValue = getCurrentValue2(ability, user);
-            String nextValue = NumberUtil.format1(ability.getSecondaryValue(user.getAbilityLevel(ability) + 1));
-            return TextUtil.replace(activeMenu.getFormat("desc_upgrade_value"),
-                    "{current}", currentValue,
-                    "{next}", nextValue);
-        }
-
-        private String getUpgradeValue(ManaAbility manaAbility, User user, ActiveMenu activeMenu) {
-            String currentValue = NumberUtil.format1(manaAbility.getDisplayValue(user.getManaAbilityLevel(manaAbility)));
-            String nextValue = NumberUtil.format1(manaAbility.getDisplayValue(user.getManaAbilityLevel(manaAbility) + 1));
-            return TextUtil.replace(activeMenu.getFormat("desc_upgrade_value"),
-                    "{current}", currentValue,
-                    "{next}", nextValue);
-        }
-
-        private String getUpgradeDuration(ManaAbility manaAbility, User user, ActiveMenu activeMenu) {
-            String currentDuration = NumberUtil.format1(getDuration(manaAbility, user.getManaAbilityLevel(manaAbility)));
-            String nextDuration = NumberUtil.format1(getDuration(manaAbility, user.getManaAbilityLevel(manaAbility) + 1));
-            return TextUtil.replace(activeMenu.getFormat("desc_upgrade_value"),
-                    "{current}", currentDuration,
-                    "{next}", nextDuration);
-        }
-
     }
 
     public static class UnlockedDescMaxed extends AbstractComponent implements ComponentProvider {
@@ -162,7 +125,7 @@ public <T> String onPlaceholderReplace(String placeholder, Player player, Active
                     return TextUtil.replace(manaAbility.getDescription(locale),
                             "{value}", NumberUtil.format1(manaAbility.getDisplayValue(user.getManaAbilityLevel(manaAbility))),
                             "{haste_level}", String.valueOf(manaAbility.optionInt("haste_level", 10)),
-                            "{duration}", NumberUtil.format1(getDuration(manaAbility, user.getManaAbilityLevel(manaAbility))));
+                            "{duration}", NumberUtil.format1(AbilityUtil.getDuration(manaAbility, user.getManaAbilityLevel(manaAbility))));
                 }
             }
             return replaceMenuMessage(placeholder, player, activeMenu);
@@ -185,14 +148,4 @@ private static boolean isNotMaxed(User user, AbstractAbility ability) {
         return user.getAbstractAbilityLevel(ability) < maxLevel;
     }
 
-    private static double getDuration(ManaAbility manaAbility, int level) {
-        if (manaAbility == ManaAbilities.LIGHTNING_BLADE) {
-            double baseDuration = ManaAbilities.LIGHTNING_BLADE.optionDouble("base_duration");
-            double durationPerLevel = ManaAbilities.LIGHTNING_BLADE.optionDouble("duration_per_level");
-            return baseDuration + (durationPerLevel * (level - 1));
-        } else {
-            return manaAbility.getValue(level);
-        }
-    }
-
 }
diff --git a/bukkit/src/main/resources/messages/messages_de.yml b/bukkit/src/main/resources/messages/messages_de.yml
index 89bb77922..8feb96f58 100644
--- a/bukkit/src/main/resources/messages/messages_de.yml
+++ b/bukkit/src/main/resources/messages/messages_de.yml
@@ -562,12 +562,14 @@ leveler:
   subtitle: "<gold>{old} ➜ {new}"
   level_up: "<dark_aqua><strikethrough>----------------------------------------\n<reset> <dark_aqua>Fähigkeiten Levelaufstieg! <aqua><bold>{skill} </bold><dark_grey>{old}➜<dark_aqua><bold>{new}\n \n </bold><aqua>Belohnung:{stat_level}{ability_unlock}{ability_level_up}{mana_ability_unlock}{mana_ability_level_up}{money_reward}\n<dark_aqua><strikethrough>----------------------------------------"
   stat_level: "\n  {color}+{num}{symbol} {stat}"
-  ability_unlock: "\n  <green>Fähigkeit freigeschaltet! <gold><bold>{ability} </bold><gray>wurde freigeschaltet"
-  ability_level_up: "\n  <green>Fähigkeiten Levelaufstieg! <gold><bold>{ability} </bold><gray> ist nun Level <gold>{level}"
-  mana_ability_unlock: "\n  <light_purple>Manafähigkeit freigeschaltet! <blue><bold>{mana_ability} </bold><gray>wurde freigeschaltet"
-  mana_ability_level_up: "\n  <light_purple>Manafähigkeiten Levelaufstieg! <blue><bold>{mana_ability} </bold><gray>ist nun Level <gold>{level}"
+  ability_unlock: "\n  <green>Fähigkeit freigeschaltet! <gold><bold>{ability} </bold><gray>wurde freigeschaltet\n      <white>{desc}"
+  ability_level_up: "\n  <green>Fähigkeiten Levelaufstieg! <gold><bold>{ability} </bold><gray> ist nun Level <gold>{level}\n      <white>{desc}"
+  mana_ability_unlock: "\n  <light_purple>Manafähigkeit freigeschaltet! <blue><bold>{mana_ability} </bold><gray>wurde freigeschaltet\n      <white>{desc}"
+  mana_ability_level_up: "\n  <light_purple>Manafähigkeiten Levelaufstieg! <blue><bold>{mana_ability} </bold><gray>ist nun Level <gold>{level}\n      <white>{desc}"
   money_reward: "\n  <green>${amount}"
   unclaimed_item: "<red>Du hast unbeanspruchte Gegenstände, weil dein Inventar voll war, benutze <yellow>/Skills um <red>to sie zu beanspruchen"
+  desc_upgrade_value: "<dark_gray>{current}→<white>{next}"
+  desc_wrap: "<white>      "
 menus:
   common:
     close: "Schließen"
@@ -1086,4 +1088,4 @@ units:
   mana: Mana
   hp: LP
   xp: EP
-file_version: 30
+file_version: 31
diff --git a/bukkit/src/main/resources/messages/messages_en.yml b/bukkit/src/main/resources/messages/messages_en.yml
index 1daef73d9..4fbc469d8 100644
--- a/bukkit/src/main/resources/messages/messages_en.yml
+++ b/bukkit/src/main/resources/messages/messages_en.yml
@@ -562,12 +562,14 @@ leveler:
   subtitle: "<gold>{old} ➜ {new}"
   level_up: "<dark_aqua><strikethrough>----------------------------------------\n<reset> <dark_aqua>Skill Level Up! <aqua><bold>{skill}</bold> <dark_gray>{old}➜<dark_aqua><bold>{new}</bold>\n \n <aqua>Rewards:{stat_level}{ability_unlock}{ability_level_up}{mana_ability_unlock}{mana_ability_level_up}{money_reward}\n<dark_aqua><strikethrough>----------------------------------------"
   stat_level: "\n  {color}+{num}{symbol} {stat}"
-  ability_unlock: "\n  <green>Ability Unlock! <gold><bold>{ability}</bold> <gray>has been unlocked"
-  ability_level_up: "\n  <green>Ability Level Up! <gold><bold>{ability}</bold> <gray>is now level <gold>{level}"
-  mana_ability_unlock: "\n  <light_purple>Mana Ability Unlock! <blue><bold>{mana_ability}</bold> <gray>has been unlocked"
-  mana_ability_level_up: "\n  <light_purple>Mana Ability Level Up! <blue><bold>{mana_ability}</bold> <gray>is now level <gold>{level}"
+  ability_unlock: "\n  <green>Ability Unlock! <gold><bold>{ability}</bold>\n      <white>{desc}"
+  ability_level_up: "\n  <green>Ability Level Up! <gold><bold>{ability}</bold> <dark_gray>{previous}→<gold>{level}\n      <white>{desc}"
+  mana_ability_unlock: "\n  <light_purple>Mana Ability Unlock! <blue><bold>{mana_ability}</bold>\n      <white>{desc}"
+  mana_ability_level_up: "\n  <light_purple>Mana Ability Level Up! <blue><bold>{mana_ability}</bold> <dark_gray>{previous}→<gold>{level}\n      <white>{desc}"
   money_reward: "\n  <green>${amount}"
   unclaimed_item: "<red>You have unclaimed items because your inventory was full, use <yellow>/skills claimitems <red>to claim them"
+  desc_upgrade_value: "<dark_gray>{current}→<white>{next}"
+  desc_wrap: "<white>      "
 menus:
   common:
     close: "Close"
@@ -1086,4 +1088,4 @@ units:
   mana: Mana
   hp: HP
   xp: XP
-file_version: 30
\ No newline at end of file
+file_version: 31
\ No newline at end of file
diff --git a/bukkit/src/main/resources/messages/messages_es.yml b/bukkit/src/main/resources/messages/messages_es.yml
index f7185ce38..d8cfdfaf1 100644
--- a/bukkit/src/main/resources/messages/messages_es.yml
+++ b/bukkit/src/main/resources/messages/messages_es.yml
@@ -562,12 +562,14 @@ leveler:
   subtitle: "<gold>{old} ➜ {new}"
   level_up: "<dark_aqua><strikethrough>----------------------------------------\n<reset> <dark_aqua>¡Nuevo Nivel! <aqua><bold>{skill} </bold><dark_grey>{old}➜<dark_aqua><bold>{new}\n \n </bold><aqua>Recompensas:{stat_level}{ability_unlock}{ability_level_up}{mana_ability_unlock}{mana_ability_level_up}{money_reward}\n<dark_aqua><strikethrough>----------------------------------------"
   stat_level: "\n  {color}+{num}{symbol} {stat}"
-  ability_unlock: "\n  <green>¡Habilidad Desbloqueada! <gold><bold>{ability} </bold><gray>ha sido desbloqueada"
-  ability_level_up: "\n  <green>¡Nuevo Nivel de Habilidad! <gold><bold>{ability} </bold><gray>es ahora nivel <gold>{level}"
-  mana_ability_unlock: "\n  <light_purple>¡Habilidad de Maná Desbloqueada! <blue><bold>{mana_ability} </bold><gray>se ha desbloqueado"
-  mana_ability_level_up: "\n  <light_purple>¡Nuevo Nivel de Habilidad de Maná! <blue><bold>{mana_ability} </bold><gray>es ahora nivel <gold>{level}"
+  ability_unlock: "\n  <green>¡Habilidad Desbloqueada! <gold><bold>{ability} </bold><gray>ha sido desbloqueada\n      <white>{desc}"
+  ability_level_up: "\n  <green>¡Nuevo Nivel de Habilidad! <gold><bold>{ability} </bold><gray>es ahora nivel <gold>{level}\n      <white>{desc}"
+  mana_ability_unlock: "\n  <light_purple>¡Habilidad de Maná Desbloqueada! <blue><bold>{mana_ability} </bold><gray>se ha desbloqueado\n      <white>{desc}"
+  mana_ability_level_up: "\n  <light_purple>¡Nuevo Nivel de Habilidad de Maná! <blue><bold>{mana_ability} </bold><gray>es ahora nivel <gold>{level}\n      <white>{desc}"
   money_reward: "\n  <green>${amount}"
   unclaimed_item: "<red>Tienes objetos sin reclamar porque tu invnetario estaba lleno, usa <yellow>/skills claimitems <red>para reclamarlos"
+  desc_upgrade_value: "<dark_gray>{current}→<white>{next}"
+  desc_wrap: "<white>      "
 menus:
   common:
     close: "Cerrar"
@@ -1086,4 +1088,4 @@ units:
   mana: Maná
   hp: HP
   xp: XP
-file_version: 30
+file_version: 31
diff --git a/bukkit/src/main/resources/messages/messages_fr.yml b/bukkit/src/main/resources/messages/messages_fr.yml
index b67c9caf6..1f0de9043 100644
--- a/bukkit/src/main/resources/messages/messages_fr.yml
+++ b/bukkit/src/main/resources/messages/messages_fr.yml
@@ -562,12 +562,14 @@ leveler:
   subtitle: "<gold>{old} ➜ {new}"
   level_up: "<dark_aqua><strikethrough>----------------------------------------\n<reset> <dark_aqua>Niveau supérieur! <aqua><bold>{skill}</bold> <dark_gray>{old}➜<dark_aqua><bold>{new}</bold> \n \n <aqua>Récompenses:{stat_level}{ability_unlock}{ability_level_up}{mana_ability_unlock}{mana_ability_level_up}{money_reward}\n<dark_aqua><strikethrough>----------------------------------------"
   stat_level: "\n  {color}+{num}{symbol} {stat}"
-  ability_unlock: "\n  <green>Compétence débloquée! <gold><bold>{ability}</bold> <gray>a été débloquée"
-  ability_level_up: "\n  <green>Niveau de compétence supérieur! <gold><bold>{ability}</bold> <gray>est maintenant niveau <gold>{level}"
-  mana_ability_unlock: "\n<light_purple>Capacité de mana débloquée! <blue><bold>{mana_ability}</bold> <gray>a été débloquée"
-  mana_ability_level_up: "\n  <light_purple>Niveau de compétence de mana supérieur! <blue><bold>{mana_ability}</bold> <gray>est maintenant niveau <gold>{level}"
+  ability_unlock: "\n  <green>Compétence débloquée! <gold><bold>{ability}</bold> <gray>a été débloquée\n      <white>{desc}"
+  ability_level_up: "\n  <green>Niveau de compétence supérieur! <gold><bold>{ability}</bold> <gray>est maintenant niveau <gold>{level}\n      <white>{desc}"
+  mana_ability_unlock: "\n<light_purple>Capacité de mana débloquée! <blue><bold>{mana_ability}</bold> <gray>a été débloquée\n      <white>{desc}"
+  mana_ability_level_up: "\n  <light_purple>Niveau de compétence de mana supérieur! <blue><bold>{mana_ability}</bold> <gray>est maintenant niveau <gold>{level}\n      <white>{desc}"
   money_reward: "\n  <green>${amount}"
   unclaimed_item: "<red>Vous avez des objets non réclamés parce que votre inventaire était plein, utilisez <yellow>/skills claimitems <red>pour les réclamer"
+  desc_upgrade_value: "<dark_gray>{current}→<white>{next}"
+  desc_wrap: "<white>      "
 menus:
   common:
     close: "Fermer"
@@ -1086,4 +1088,4 @@ units:
   mana: Mana
   hp: PV
   xp: XP
-file_version: 30
+file_version: 31
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/ability/AbilityUtil.java b/common/src/main/java/dev/aurelium/auraskills/common/ability/AbilityUtil.java
new file mode 100644
index 000000000..fd5c5413c
--- /dev/null
+++ b/common/src/main/java/dev/aurelium/auraskills/common/ability/AbilityUtil.java
@@ -0,0 +1,61 @@
+package dev.aurelium.auraskills.common.ability;
+
+import dev.aurelium.auraskills.api.ability.Ability;
+import dev.aurelium.auraskills.api.mana.ManaAbilities;
+import dev.aurelium.auraskills.api.mana.ManaAbility;
+import dev.aurelium.auraskills.api.util.NumberUtil;
+import dev.aurelium.auraskills.common.util.text.TextUtil;
+
+public class AbilityUtil {
+
+    public static String getUpgradeValue(Ability ability, int level, String format) {
+        String currentValue = getCurrentValue(ability, level);
+        String nextValue = NumberUtil.format1(ability.getValue(level + 1));
+        return TextUtil.replace(format,
+                "{current}", currentValue,
+                "{next}", nextValue);
+    }
+
+    public static String getUpgradeValue2(Ability ability, int level, String format) {
+        String currentValue = getCurrentValue2(ability, level);
+        String nextValue = NumberUtil.format1(ability.getSecondaryValue(level + 1));
+        return TextUtil.replace(format,
+                "{current}", currentValue,
+                "{next}", nextValue);
+    }
+
+    public static String getCurrentValue(Ability ability, int level) {
+        return NumberUtil.format1(ability.getValue(level));
+    }
+
+    public static String getCurrentValue2(Ability ability, int level) {
+        return NumberUtil.format1(ability.getSecondaryValue(level));
+    }
+
+    public static String getUpgradeValue(ManaAbility manaAbility, int level, String format) {
+        String currentValue = NumberUtil.format1(manaAbility.getDisplayValue(level));
+        String nextValue = NumberUtil.format1(manaAbility.getDisplayValue(level + 1));
+        return TextUtil.replace(format,
+                "{current}", currentValue,
+                "{next}", nextValue);
+    }
+
+    public static String getUpgradeDuration(ManaAbility manaAbility, int level, String format) {
+        String currentDuration = NumberUtil.format1(getDuration(manaAbility, level));
+        String nextDuration = NumberUtil.format1(getDuration(manaAbility, level + 1));
+        return TextUtil.replace(format,
+                "{current}", currentDuration,
+                "{next}", nextDuration);
+    }
+
+    public static double getDuration(ManaAbility manaAbility, int level) {
+        if (manaAbility == ManaAbilities.LIGHTNING_BLADE) {
+            double baseDuration = ManaAbilities.LIGHTNING_BLADE.optionDouble("base_duration");
+            double durationPerLevel = ManaAbilities.LIGHTNING_BLADE.optionDouble("duration_per_level");
+            return baseDuration + (durationPerLevel * (level - 1));
+        } else {
+            return manaAbility.getValue(level);
+        }
+    }
+
+}
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/level/LevelUpMessenger.java b/common/src/main/java/dev/aurelium/auraskills/common/level/LevelUpMessenger.java
index 4528fc26c..ffcbfa71b 100644
--- a/common/src/main/java/dev/aurelium/auraskills/common/level/LevelUpMessenger.java
+++ b/common/src/main/java/dev/aurelium/auraskills/common/level/LevelUpMessenger.java
@@ -3,7 +3,9 @@
 import dev.aurelium.auraskills.api.ability.Ability;
 import dev.aurelium.auraskills.api.mana.ManaAbility;
 import dev.aurelium.auraskills.api.skill.Skill;
+import dev.aurelium.auraskills.api.util.NumberUtil;
 import dev.aurelium.auraskills.common.AuraSkillsPlugin;
+import dev.aurelium.auraskills.common.ability.AbilityUtil;
 import dev.aurelium.auraskills.common.config.Option;
 import dev.aurelium.auraskills.common.message.MessageBuilder;
 import dev.aurelium.auraskills.common.message.type.LevelerMessage;
@@ -11,6 +13,7 @@
 import dev.aurelium.auraskills.common.reward.type.MoneyReward;
 import dev.aurelium.auraskills.common.user.User;
 import dev.aurelium.auraskills.common.util.math.RomanNumber;
+import dev.aurelium.auraskills.common.util.text.TextUtil;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -19,6 +22,7 @@
 
 public class LevelUpMessenger {
 
+    private static final int WRAP_LENGTH = 40;
     private final AuraSkillsPlugin plugin;
     private final User user;
     private final Locale locale;
@@ -80,30 +84,48 @@ private String getAbilityUnlockMessage() {
                 continue;
             }
             if (ability.getUnlock() == level) { // If ability is unlocked at this level
+                String desc = TextUtil.replace(ability.getDescription(locale),
+                        "{value}", AbilityUtil.getCurrentValue(ability, 1),
+                        "{value_2}", AbilityUtil.getCurrentValue2(ability, 1));
+                desc = TextUtil.wrapText(desc, WRAP_LENGTH, "\n" + descWrap(locale));
                 builder.message(LevelerMessage.ABILITY_UNLOCK,
-                        "ability", ability.getDisplayName(locale));
+                        "ability", ability.getDisplayName(locale),
+                        "desc", desc);
             }
         }
         return builder.toString();
     }
 
     private String getAbilityLevelUpMessage() {
-        MessageBuilder builder = MessageBuilder.create(plugin).locale(locale);
+        StringBuilder sb = new StringBuilder();
         for (Ability ability : plugin.getAbilityManager().getAbilities(skill, level)) {
             if (!ability.isEnabled()) {
                 continue;
             }
             if (ability.getUnlock() != level) { // If ability is unlocked at this level
-                builder.message(LevelerMessage.ABILITY_LEVEL_UP,
-                        "ability", ability.getDisplayName(locale),
-                        "level", RomanNumber.toRoman(user.getAbilityLevel(ability), plugin));
+                int level = user.getAbilityLevel(ability);
+                sb.append(TextUtil.replace(plugin.getMsg(LevelerMessage.ABILITY_LEVEL_UP, locale),
+                        "{ability}", ability.getDisplayName(locale),
+                        "{previous}", RomanNumber.toRoman(level - 1, plugin),
+                        "{level}", RomanNumber.toRoman(level, plugin),
+                        "{desc}", getAbilityLevelUpDesc(ability, level, locale)));
             }
         }
-        return builder.toString();
+        return sb.toString();
+    }
+
+    private String getAbilityLevelUpDesc(Ability ability, int level, Locale locale) {
+        String format = plugin.getMsg(LevelerMessage.DESC_UPGRADE_VALUE, locale);
+        // Subtract 1 from level to go from previous to current value
+        String desc = TextUtil.replace(ability.getDescription(locale),
+                        "{value}", AbilityUtil.getUpgradeValue(ability, level - 1, format),
+                        "{value_2}", AbilityUtil.getUpgradeValue2(ability, level - 1, format));
+        desc = TextUtil.wrapText(desc, WRAP_LENGTH, "\n" + descWrap(locale));
+        return com.archyx.polyglot.util.TextUtil.applyColor(desc);
     }
 
     private String getManaAbilityUnlockMessage() {
-        MessageBuilder builder = MessageBuilder.create(plugin).locale(locale);
+        StringBuilder sb = new StringBuilder();
         ManaAbility manaAbility = plugin.getManaAbilityManager().getManaAbilityAtLevel(skill, level);
 
         if (manaAbility == null) return "";
@@ -111,14 +133,20 @@ private String getManaAbilityUnlockMessage() {
 
         // If mana ability is unlocked at this level
         if (manaAbility.getUnlock() == level) {
-            builder.message(LevelerMessage.MANA_ABILITY_UNLOCK,
-                    "mana_ability", manaAbility.getDisplayName(locale));
+            String desc = TextUtil.replace(manaAbility.getDescription(locale).replace("<1>", "<white>"),
+                    "{value}", String.valueOf(manaAbility.getDisplayValue(1)),
+                    "{haste_level}", String.valueOf(manaAbility.optionInt("haste_level", 10)),
+                    "{duration}", NumberUtil.format1(AbilityUtil.getDuration(manaAbility, 1)));
+            desc = TextUtil.wrapText(desc, WRAP_LENGTH, "\n" + descWrap(locale));
+            sb.append(TextUtil.replace(plugin.getMsg(LevelerMessage.MANA_ABILITY_UNLOCK, locale),
+                    "{mana_ability}", manaAbility.getDisplayName(locale),
+                    "{desc}", desc));
         }
-        return builder.toString();
+        return com.archyx.polyglot.util.TextUtil.applyColor(sb.toString());
     }
 
     private String getManaAbilityLevelUpMessage() {
-        MessageBuilder builder = MessageBuilder.create(plugin).locale(locale);
+        StringBuilder sb = new StringBuilder();
         ManaAbility manaAbility = plugin.getManaAbilityManager().getManaAbilityAtLevel(skill, level);
 
         if (manaAbility == null) return "";
@@ -126,11 +154,25 @@ private String getManaAbilityLevelUpMessage() {
 
         // If mana ability is unlocked at this level
         if (manaAbility.getUnlock() != level) {
-            builder.message(LevelerMessage.MANA_ABILITY_LEVEL_UP,
-                    "mana_ability", manaAbility.getDisplayName(locale),
-                    "level", RomanNumber.toRoman(user.getManaAbilityLevel(manaAbility), plugin));
+            int level = user.getManaAbilityLevel(manaAbility);
+            sb.append(TextUtil.replace(plugin.getMsg(LevelerMessage.MANA_ABILITY_LEVEL_UP, locale),
+                    "{mana_ability}", manaAbility.getDisplayName(locale),
+                    "{previous}", RomanNumber.toRoman(level - 1, plugin),
+                    "{level}", RomanNumber.toRoman(level, plugin),
+                    "{desc}", getManaAbilityLevelUpDesc(manaAbility, level, locale)));
         }
-        return builder.toString();
+        return com.archyx.polyglot.util.TextUtil.applyColor(sb.toString());
+    }
+
+    private String getManaAbilityLevelUpDesc(ManaAbility manaAbility, int level, Locale locale) {
+        String format = plugin.getMsg(LevelerMessage.DESC_UPGRADE_VALUE, locale);
+        // Subtract 1 from level to go from previous to current value
+        String message = TextUtil.replace(manaAbility.getDescription(locale).replace("<1>", "<white>"),
+                        "{value}", AbilityUtil.getUpgradeValue(manaAbility, level - 1, format),
+                        "{haste_level}", String.valueOf(manaAbility.optionInt("haste_level", 10)),
+                        "{duration}", AbilityUtil.getUpgradeDuration(manaAbility, level - 1, format));
+        message = TextUtil.wrapText(message, WRAP_LENGTH, "\n" + descWrap(locale));
+        return message;
     }
 
     private String getMoneyRewardMessage() {
@@ -148,4 +190,8 @@ private String getMoneyRewardMessage() {
         return builder.toString();
     }
 
+    private String descWrap(Locale locale) {
+        return plugin.getMsg(LevelerMessage.DESC_WRAP, locale);
+    }
+
 }
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/message/type/LevelerMessage.java b/common/src/main/java/dev/aurelium/auraskills/common/message/type/LevelerMessage.java
index d168f7edd..b347cac2c 100644
--- a/common/src/main/java/dev/aurelium/auraskills/common/message/type/LevelerMessage.java
+++ b/common/src/main/java/dev/aurelium/auraskills/common/message/type/LevelerMessage.java
@@ -14,8 +14,10 @@ public enum LevelerMessage implements MessageKey {
     ABILITY_LEVEL_UP,
     MANA_ABILITY_UNLOCK,
     MANA_ABILITY_LEVEL_UP,
+    DESC_UPGRADE_VALUE,
     MONEY_REWARD,
-    UNCLAIMED_ITEM;
+    UNCLAIMED_ITEM,
+    DESC_WRAP;
 
     @Override
     public String getPath() {
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/util/text/TextUtil.java b/common/src/main/java/dev/aurelium/auraskills/common/util/text/TextUtil.java
index 0af9d8792..ce002a3da 100644
--- a/common/src/main/java/dev/aurelium/auraskills/common/util/text/TextUtil.java
+++ b/common/src/main/java/dev/aurelium/auraskills/common/util/text/TextUtil.java
@@ -239,4 +239,78 @@ public static List<String> getPlaceholders(String text) {
         return placeholders;
     }
 
+    public static String wrapText(String input, int maxLength, String insertion) {
+        StringBuilder sb = new StringBuilder(input);
+
+        int i = 0;
+        List<String> lines = new ArrayList<>();
+        while (i < input.length()) {
+            String sub = substringIgnoreFormatting(sb.toString(), i, Math.min(i + maxLength, input.length()));
+            int addedLength = 0;
+            if (!sub.equals(" ")) {
+                String added = substringIgnoreFormatting(sub, 0, Math.min(maxLength, sub.length()));
+                int lastSpace = added.lastIndexOf(" ");
+                if (lastSpace != -1) { // Check if section contains spaces
+                    if (sb.charAt(Math.min(i + added.length(), sb.length() - 1)) == ' ' || i + added.length() == sb.length()) { // Complete word or last word
+                        lines.add(added);
+                        addedLength = added.length();
+                    } else { // Cut off word
+                        String addedCutOff = added.substring(0, lastSpace);
+                        addedLength = addedCutOff.length();
+                        lines.add(addedCutOff);
+                    }
+                } else { // Add the max number of characters and cut off word
+                    lines.add(added);
+                    addedLength = added.length();
+                }
+            }
+            i = i + addedLength;
+            if (i < sb.length()) {
+                if (sb.charAt(i) == ' ') {
+                    i++;
+                }
+            }
+        }
+        StringBuilder output = new StringBuilder();
+        String lastInsertion = "";
+        for (String line : lines) {
+            lastInsertion = insertion;
+            output.append(line).append(insertion);
+        }
+        output.replace(output.length() - lastInsertion.length(), output.length(), "");
+        return output.toString();
+    }
+
+    private static String substringIgnoreFormatting(String input, int start, int end) {
+        if (input == null || input.isEmpty()) {
+            return "";
+        }
+        if (start < 0 || end > input.length() || start > end) {
+            return "";
+        }
+        StringBuilder result = new StringBuilder();
+        boolean insideBrackets = false;
+        int count = 0;
+        for (int i = 0; i < input.length(); i++) {
+            char c = input.charAt(i);
+            if (c == '<') {
+                insideBrackets = true;
+            }
+            if (c == '>') {
+                insideBrackets = false;
+            }
+            if (!insideBrackets || count <= start) {
+                count++;
+            }
+            if (count > start && count <= end) {
+                result.append(c);
+            }
+            if (count > end) {
+                break;
+            }
+        }
+
+        return result.toString();
+    }
+
 }