Index: modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java (revision 490473) +++ modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java (working copy) @@ -573,7 +573,7 @@ } protected int getMaxCharactersPerLineCount() { - return Integer.MAX_VALUE; + return optionPane.getMaxCharactersPerLineCount(); } protected void burstStringInto(final Container c, final String d,