diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
index 961f4c326..6a6bbf740 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
@@ -345,6 +345,14 @@ public class DefineText2Tag extends TextTag {
                             throw new TextParseException("Font not defined", lexer.yyline());
                         }
 
+                        while (txt.charAt(0) == '\r' || txt.charAt(0) == '\n') {
+                            txt = txt.substring(1);
+                        }
+
+                        while (txt.charAt(txt.length() - 1) == '\r' || txt.charAt(txt.length() - 1) == '\n') {
+                            txt = txt.substring(0, txt.length() - 1);
+                        }
+
                         StringBuilder txtSb = new StringBuilder();
                         for (int i = 0; i < txt.length(); i++) {
                             char c = txt.charAt(i);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
index 3efb9b68b..43991ccac 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
@@ -351,6 +351,14 @@ public class DefineTextTag extends TextTag {
                             throw new TextParseException("Font not defined", lexer.yyline());
                         }
 
+                        while (txt.charAt(0) == '\r' || txt.charAt(0) == '\n') {
+                            txt = txt.substring(1);
+                        }
+
+                        while (txt.charAt(txt.length() - 1) == '\r' || txt.charAt(txt.length() - 1) == '\n') {
+                            txt = txt.substring(0, txt.length() - 1);
+                        }
+
                         StringBuilder txtSb = new StringBuilder();
                         for (int i = 0; i < txt.length(); i++) {
                             char c = txt.charAt(i);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java
index da87972a2..4c33dd9ef 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java
@@ -395,7 +395,7 @@ public abstract class TextTag extends CharacterTag implements DrawableTag {
 
     public void updateTextBounds(RECT textBounds) {
         TextImportResizeTextBoundsMode resizeMode = Configuration.textImportResizeTextBoundsMode.get();
-        if (resizeMode.equals(TextImportResizeTextBoundsMode.GROW_ONLY) || resizeMode.equals(TextImportResizeTextBoundsMode.GROW_AND_SHRINK)) {
+        if (resizeMode != null && (resizeMode.equals(TextImportResizeTextBoundsMode.GROW_ONLY) || resizeMode.equals(TextImportResizeTextBoundsMode.GROW_AND_SHRINK))) {
             ExportRectangle newBounds = calculateTextBounds();
             if (newBounds != null) {
                 int xMin = (int) Math.floor(newBounds.xMin);