diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index e9d551acb3..133752d7b8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -19,6 +19,7 @@ package eu.faircode.email;
     Copyright 2018-2019 by Marcel Bokhorst (M66B)
 */
 
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,9 +39,11 @@ public class FragmentAbout extends FragmentBase {
 
         View view = inflater.inflate(R.layout.fragment_about, container, false);
 
+        TextView tvLimitations = view.findViewById(R.id.tvLimitations);
         tvVersion = view.findViewById(R.id.tvVersion);
 
         tvVersion.setText(getString(R.string.title_version, BuildConfig.VERSION_NAME));
+        tvLimitations.setPaintFlags(tvLimitations.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 
         return view;
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentEula.java b/app/src/main/java/eu/faircode/email/FragmentEula.java
index 2906379f97..a7920fe2d1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentEula.java
+++ b/app/src/main/java/eu/faircode/email/FragmentEula.java
@@ -20,11 +20,13 @@ package eu.faircode.email;
 */
 
 import android.content.SharedPreferences;
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -38,9 +40,12 @@ public class FragmentEula extends FragmentBase {
 
         View view = inflater.inflate(R.layout.fragment_eula, container, false);
 
+        TextView tvLimitations = view.findViewById(R.id.tvLimitations);
         Button btnAgree = view.findViewById(R.id.btnOk);
         Button btnDisagree = view.findViewById(R.id.btnCancel);
 
+        tvLimitations.setPaintFlags(tvLimitations.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+
         btnAgree.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {