diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java
index 025f11e4..decf6432 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java
@@ -30,7 +30,7 @@
 import android.text.style.StrikethroughSpan;
 import android.text.style.SubscriptSpan;
 import android.text.style.SuperscriptSpan;
-import android.text.style.UnderlineSpan;
+import com.onegravity.rteditor.spans.UnderlineSpan;
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.format.RTFormat;
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java
index 2340c0dc..6bd73a51 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java
@@ -26,7 +26,7 @@
 import android.text.style.SubscriptSpan;
 import android.text.style.SuperscriptSpan;
 import android.text.style.URLSpan;
-import android.text.style.UnderlineSpan;
+import com.onegravity.rteditor.spans.UnderlineSpan;
 
 import com.onegravity.rteditor.api.format.RTFormat;
 import com.onegravity.rteditor.api.format.RTHtml;
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/effects/UnderlineEffect.java b/RTEditor/src/main/java/com/onegravity/rteditor/effects/UnderlineEffect.java
index ccefbfa2..6f9dbd24 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/effects/UnderlineEffect.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/effects/UnderlineEffect.java
@@ -16,7 +16,7 @@
 
 package com.onegravity.rteditor.effects;
 
-import android.text.style.UnderlineSpan;
+import com.onegravity.rteditor.spans.UnderlineSpan;
 
 /**
  * Underlined text
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/spans/UnderlineSpan.java b/RTEditor/src/main/java/com/onegravity/rteditor/spans/UnderlineSpan.java
new file mode 100644
index 00000000..5bfcedec
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/spans/UnderlineSpan.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.spans;
+
+/**
+ * Our custom UnderlineSpan.
+ * We need this to be able to distinguish between underlining done by the app and underlining
+ * inserted by e.g. a spell checker or a keyboard with auto-complete function.
+ */
+public class UnderlineSpan extends android.text.style.UnderlineSpan {}
\ No newline at end of file