diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
index dff8c6924..89f586c9e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
@@ -92,6 +92,7 @@ public class DefineEditTextTag extends CharacterTag implements BoundedTag, TextT
     private String stripTags(String inp) {
         boolean intag = false;
         String outp = "";
+        inp = inp.replaceAll("<br ?/?>", "\r\n");
         for (int i = 0; i < inp.length(); ++i) {
             if (!intag && inp.charAt(i) == '<') {
                 intag = true;
@@ -118,7 +119,10 @@ public class DefineEditTextTag extends CharacterTag implements BoundedTag, TextT
 
     @Override
     public String getText(List<Tag> tags) {
-        String ret = getFormattedText(tags);
+        String ret = "";
+        if (hasText) {
+            ret = initialText;
+        }
         if (html) {
             ret = stripTags(ret);
             ret = entitiesReplace(ret);
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
index 2ba919feb..20c30a265 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
@@ -110,7 +110,7 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag, Mor
      *
      * @param data Data bytes
      * @param version SWF version
-     * @param pos 
+     * @param pos
      * @throws IOException
      */
     public DefineMorphShapeTag(byte data[], int version, long pos) throws IOException {
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
index d229d7943..52a12de80 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
@@ -96,7 +96,7 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag,
                 }
             }
             if (rec.styleFlagsHasXOffset || rec.styleFlagsHasYOffset) {
-                if (!rec.equals("")) {
+                if (!ret.equals("")) {
                     ret += "\r\n";
                 }
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
index b51a6604a..541648c58 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
@@ -96,7 +96,7 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag,
                 }
             }
             if (rec.styleFlagsHasXOffset || rec.styleFlagsHasYOffset) {
-                if (!rec.equals("")) {
+                if (!ret.equals("")) {
                     ret += "\r\n";
                 }
             }