diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Account.java b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
index ee0eb60ef..a57dd3c33 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Account.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
@@ -828,6 +828,37 @@ public class Account implements Parcelable {
                         }
                     }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
             }
+            matcher = Pattern.compile("gemini://([\\d\\w.-]*)(:\\d+)?(/\\S*)?").matcher(fieldSpan);
+            while (matcher.find()) {
+                URLSpan[] urls = fieldSpan.getSpans(0, fieldSpan.length(), URLSpan.class);
+                for (URLSpan span : urls)
+                    fieldSpan.removeSpan(span);
+                int matchStart = matcher.start(0);
+                int matchEnd = matcher.end();
+                final String url = fieldSpan.toString().substring(matchStart, matchEnd);
+                if (matchStart >= 0 && matchEnd <= fieldSpan.toString().length() && matchEnd >= matchStart) {
+                    fieldSpan.setSpan(new ClickableSpan() {
+                        @Override
+                        public void onClick(@NonNull View textView) {
+                            try {
+                                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                                context.startActivity(intent);
+                            } catch (Exception e) {
+                                Toasty.error(context, context.getString(R.string.toast_no_apps), Toast.LENGTH_LONG).show();
+                            }
+                        }
+
+                        @Override
+                        public void updateDrawState(@NonNull TextPaint ds) {
+                            super.updateDrawState(ds);
+                            ds.setUnderlineText(false);
+                            ds.setColor(link_color);
+                        }
+                    }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+                    fieldsSpan.put(keySpan, fieldSpan);
+                }
+
+            }
             if (accountsMentionUnknown.size() > 0) {
                 for (Account accountMention : accountsMentionUnknown) {
                     String targetedAccount = "@" + accountMention.getAcct();
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
index 55a546dd2..e00399538 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
@@ -665,9 +665,7 @@ public class Status implements Parcelable {
                                                                      intent.putExtras(b);
                                                                      context.startActivity(intent);
                                                                  } else {
-                                                                     if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
-                                                                         finalUrl = "http://" + url;
-                                                                     Helper.openBrowser(context, finalUrl);
+                                                                     Helper.openBrowser(context, url);
                                                                  }
 
                                                              }
@@ -891,10 +889,7 @@ public class Status implements Parcelable {
                 contentSpanTranslated.setSpan(new ClickableSpan() {
                                                   @Override
                                                   public void onClick(@NonNull View textView) {
-                                                      String finalUrl = url;
-                                                      if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
-                                                          finalUrl = "http://" + url;
-                                                      Helper.openBrowser(context, finalUrl);
+                                                      Helper.openBrowser(context, url);
                                                   }
 
                                                   @Override
diff --git a/app/src/main/java/app/fedilab/android/helper/BaseHelper.java b/app/src/main/java/app/fedilab/android/helper/BaseHelper.java
index 0bb588585..aa657fc16 100644
--- a/app/src/main/java/app/fedilab/android/helper/BaseHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/BaseHelper.java
@@ -3166,7 +3166,7 @@ public class BaseHelper {
     public static void openBrowser(Context context, String url) {
         SharedPreferences sharedpreferences = context.getSharedPreferences(APP_PREFS, android.content.Context.MODE_PRIVATE);
         boolean embedded_browser = sharedpreferences.getBoolean(SET_EMBEDDED_BROWSER, true);
-        if (embedded_browser) {
+        if (embedded_browser && !url.toLowerCase().startsWith("gemini://")) {
             Intent intent = new Intent(context, WebviewActivity.class);
             Bundle b = new Bundle();
             String finalUrl = url;