diff --git a/icewm-mail.patch b/icewm-mail.patch
new file mode 100644
index 0000000..62681bd
--- /dev/null
+++ b/icewm-mail.patch
@@ -0,0 +1,14 @@
+diff -Naur icewm-1.3.12.orig/src/default.h icewm-1.3.12/src/default.h
+--- icewm-1.3.12.orig/src/default.h	2015-12-17 02:17:06.000000000 +0100
++++ icewm-1.3.12/src/default.h	2017-02-20 15:58:12.275577702 +0100
+@@ -174,8 +174,8 @@
+ #endif
+ 
+ XSV(const char *, mailBoxPath,                  0)
+-XSV(const char *, mailCommand,                  "xterm -name alpine -title ALPINE -e alpine")
+-XSV(const char *, mailClassHint,                "alpine.XTerm")
++XSV(const char *, mailCommand,                  "xterm -name mutt -e mutt")
++XSV(const char *, mailClassHint,                "mutt.XTerm")
+ XSV(const char *, newMailCommand,               0)
+ XSV(const char *, lockCommand,                  0)
+ XSV(const char *, clockCommand,                 "xclock -name icewm -title Clock")
diff --git a/icewm.changes b/icewm.changes
index 534b0f9..f2aae5c 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 22 10:19:04 UTC 2017 - okurz@suse.com
+
+- Ensure a valid mailbox check tool (bsc#1026134)
+  Merged upstream contribution https://github.com/bbidulock/icewm/pull/108
+
 -------------------------------------------------------------------
 Thu Aug 25 10:00:58 UTC 2016 - fvogt@suse.com
 
diff --git a/icewm.spec b/icewm.spec
index 3a5eaae..3124758 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package icewm
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,9 @@ Patch1:         icewm-susemenu.patch
 Patch2:         icewm-session-desktop.patch
 # PATCH-FIX-OPENSUSE run shutdown and reboot in background
 Patch3:         icewm-exit-fork.patch
+# Fix for bsc#1026134, replace alpine by an alternative being available by
+# default on SLE/openSUSE, same as done on Debian
+Patch4:         icewm-mail.patch
 Patch99:        icewm-preferences.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -137,6 +140,7 @@ mailbox status, and a digital clock. It is fast and small.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 # Do not require needlessly new gettext.
 sed -i 's/0.19.6/0.18.3/g' configure.ac