Merge branch 'release'

1 files changed, 3 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/utils/HtmlUtils.java b/main/src/cgeo/geocaching/utils/HtmlUtils.java
index 5717a37..37e20ec 100644
--- a/main/src/cgeo/geocaching/utils/HtmlUtils.java
+++ b/main/src/cgeo/geocaching/utils/HtmlUtils.java
@@ -3,6 +3,7 @@ package cgeo.geocaching.utils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
+import android.text.Html;
 import android.text.Spanned;
 import android.text.style.ImageSpan;
 
@@ -56,7 +57,7 @@ public final class HtmlUtils {
             }
         }
 
-        // some line breaks are still in the text, source is unknown
-        return StringUtils.replace(result, "<br />", "\n").trim();
+        // now that images are gone, do a normal html to text conversion
+        return Html.fromHtml(result).toString().trim();
     }
 }