7 files changed, 35 insertions, 3 deletions

diff --git a/README b/README
index 6a52717d0..a5a92a9d7 100644
--- a/README
+++ b/README
@@ -411,7 +411,7 @@ startx2017 (https://github.com/startx2017)
         - Blender and 2048-qt profiles
         - handbrake profile
         - mplayer and smplayer profiles
-        - kwrite profile
+        - kwrite and geary profiles
 thewisenerd (https://github.com/thewisenerd)
         - allow multiple private-home commands
         - use $SHELL variable if the shell is not specified
diff --git a/README.md b/README.md
index aef7e96fa..47356036d 100644
--- a/README.md
+++ b/README.md
@@ -66,5 +66,5 @@ Use this issue to request new profiles: https://github.com/netblue30/firejail/is
 
 ## New profiles:
 
-curl, mplayer2, SMPlayer, Calibre, ebook-viewer
+curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary
 
diff --git a/RELNOTES b/RELNOTES
index c45ecc0fc..efe4170c7 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,7 @@
 firejail (0.9.49) baseline; urgency=low
   * work in progress!
-  * new profiles: curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite
+  * new profiles: curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite,
+  * new profiles: Geary
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Mon, 12 Jun 2017 20:00:00 -0500
 
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 911a050e5..655a44a04 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -268,6 +268,7 @@ blacklist ${HOME}/.local/share/epiphany
 blacklist ${HOME}/.local/share/evolution
 blacklist ${HOME}/.local/share/feral-interactive
 blacklist ${HOME}/.local/share/gajim
+blacklist ${HOME}/.local/share/geary
 blacklist ${HOME}/.local/share/geeqie
 blacklist ${HOME}/.local/share/gnome-2048
 blacklist ${HOME}/.local/share/gnome-chess
diff --git a/etc/geary.profile b/etc/geary.profile
new file mode 100644
index 000000000..1b702c83c
--- /dev/null
+++ b/etc/geary.profile
@@ -0,0 +1,28 @@
+# Persistent global definitions go here
+include /etc/firejail/globals.local
+
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include /etc/firejail/geray.local
+
+# Firejail profile for Gnome Geary
+# Users have Geary set to open a browser by clicking a link in an email
+# We are not allowed to blacklist browser-specific directories
+
+noblacklist ~/.gnupg
+mkdir ~/.gnupg
+whitelist ~/.gnupg
+
+noblacklist ~/.local/share/geary
+mkdir ~/.local/share/geary
+whitelist ~/.local/share/geary
+
+whitelist ~/.config/mimeapps.list
+read-only ~/.config/mimeapps.list
+whitelist ~/.local/share/applications
+read-only ~/.local/share/applications
+
+# allow browsers
+ignore private-tmp
+include /etc/firejail/firefox.profile
+#include /etc/firejail/chromium.profile - chromium runs as suid!
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index d08329022..a8f597b07 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -315,3 +315,4 @@
 /etc/firejail/handbrake-gtk.profile
 /etc/firejail/ghb.profile
 /etc/firejail/kwrite.profile
+/etc/firejail/geary.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index e9883cb68..6a93f4976 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -74,6 +74,7 @@ FossaMail
 gajim
 galculator
 geany
+geary
 gedit
 geeqie
 ghb