diff --git a/assets/css/styles.css b/assets/css/styles.css
index 2a96477f790f94b57ce97fafaa6b7e864756536d..cdd45ec79d423d8f3e23c5c6042fa1273b849ef7 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -499,6 +499,11 @@ figcaption {
*line-height:1.3em;
}
+span.reverse {
+ unicode-bidi: bidi-override;
+ direction: rtl;
+}
+
@media only screen and (max-width:48em) {
#wrapper {margin-bottom:-5em;}
diff --git a/content/hiring/2018-05-java-developer.md b/content/hiring/2018-05-java-developer.md
index db980f9f919654b1fb3c644576d1c2f0dc90c701..db8bdd204ac737140c491192823363e13c54c11b 100644
--- a/content/hiring/2018-05-java-developer.md
+++ b/content/hiring/2018-05-java-developer.md
@@ -4,8 +4,9 @@ date: 2018-05-01T00:00:00+01:00
---
Sorry, this position is no longer available. If you'd like to hear about
-future vacancies, please email <contact@briarproject.org> \[[PGP
-key](/keys/contact.asc)\].
+future vacancies, please email {{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/hiring/2018-05-usability-consultant.md b/content/hiring/2018-05-usability-consultant.md
index 9fb25b13324929c78d652bf4332828256663e9df..d2c7df25b4e5f2d42b23277e02b944a5a94c146c 100644
--- a/content/hiring/2018-05-usability-consultant.md
+++ b/content/hiring/2018-05-usability-consultant.md
@@ -4,8 +4,9 @@ title: Usability Consultant
---
Sorry, this position is no longer available. If you'd like to hear about
-future vacancies, please email <contact@briarproject.org> \[[PGP
-key](/keys/contact.asc)\].
+future vacancies, please email {{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/hiring/2018-05-ux-designer.md b/content/hiring/2018-05-ux-designer.md
index aa090b2ddc678ff062deb3923e862e4c56c487c0..c1ee85f0a0646f8e4d9abed4d390b5a475a537e5 100644
--- a/content/hiring/2018-05-ux-designer.md
+++ b/content/hiring/2018-05-ux-designer.md
@@ -4,8 +4,9 @@ title: UX Designer
---
Sorry, this position is no longer available. If you'd like to hear about
-future vacancies, please email <contact@briarproject.org> \[[PGP
-key](/keys/contact.asc)\].
+future vacancies, please email {{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/news/2017-beta-released-security-audit.md b/content/news/2017-beta-released-security-audit.md
index 283a7884b86c0c704794640e8a7f1796c406f5ee..c1738f8d1b74fc2b27bdc3dad7a6c4b0f488fe78 100644
--- a/content/news/2017-beta-released-security-audit.md
+++ b/content/news/2017-beta-released-security-audit.md
@@ -89,10 +89,12 @@ Fund](https://www.opentech.fund).
### Contact
-Torsten Grote <<t@grobox.de>> \[[PGP
-key](https://grobox.de/gpg/0x74DCA8A36C52F833.asc)\]
+Torsten Grote {{<hidingemail
+ email="<gro.tcejorprairb@netsrot>"
+ pgplink="https://grobox.de/gpg/0x74DCA8A36C52F833.asc" >}}
-Michael Rogers <<contact@briarproject.org>> \[[PGP
-key](/keys/contact.asc)\]
+Michael Rogers{{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}
[@BriarApp](https://twitter.com/BriarApp)
diff --git a/content/news/2018-1.0-released-new-funding.md b/content/news/2018-1.0-released-new-funding.md
index 4040eb7c77e05bca2efc3c95c11bb206b82d2a1c..20dede6d68cdcae32afae275ef7953971902141c 100644
--- a/content/news/2018-1.0-released-new-funding.md
+++ b/content/news/2018-1.0-released-new-funding.md
@@ -87,10 +87,12 @@ Fund](https://www.opentech.fund).
### Contact
-Torsten Grote <<t@grobox.de>> \[[PGP
-key](https://grobox.de/gpg/0x74DCA8A36C52F833.asc)\]
+Torsten Grote {{<hidingemail
+ email="<gro.tcejorprairb@netsrot>"
+ pgplink="https://grobox.de/gpg/0x74DCA8A36C52F833.asc" >}}
-Michael Rogers <<contact@briarproject.org>> \[[PGP
-key](/keys/contact.asc)\]
+Michael Rogers{{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}
[@BriarApp](https://twitter.com/BriarApp)
diff --git a/content/news/2018-briar-1.1-released.md b/content/news/2018-briar-1.1-released.md
index 8cef8982b3cd35632ddbed7a9ec18bf51f960917..0009a0ee5f43b9afdf8267622288a1aca99e4455 100644
--- a/content/news/2018-briar-1.1-released.md
+++ b/content/news/2018-briar-1.1-released.md
@@ -86,10 +86,12 @@ Fund](https://prototypefund.de/).
### Contact
-Torsten Grote <<torsten@briarproject.org>> \[[PGP
-key](https://grobox.de/gpg/0x74DCA8A36C52F833.asc)\]
+Torsten Grote {{<hidingemail
+ email="<gro.tcejorprairb@netsrot>"
+ pgplink="https://grobox.de/gpg/0x74DCA8A36C52F833.asc" >}}
-Michael Rogers <<contact@briarproject.org>> \[[PGP
-key](/keys/contact.asc)\]
+Michael Rogers{{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}
Twitter: [@BriarApp](https://twitter.com/BriarApp)
diff --git a/content/page/about.md b/content/page/about.md
index ea883a9d6d7c3175f0385fa0c1c75488bd86c742..97ae0c42bc10072da54ee961991dfb1847e3f14b 100644
--- a/content/page/about.md
+++ b/content/page/about.md
@@ -53,5 +53,6 @@ Fund](https://www.opentech.fund/), the [Prototype
Fund](https://prototypefund.de/), and
[Internews](https://www.internews.org/).
-To contact the team, please email <contact@briarproject.org> \[[PGP
-key](/keys/contact.asc)\].
+To contact the team, please email {{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
diff --git a/content/page/download.md b/content/page/download.md
index c29bd6bbc47213fd4912e461e8fa00991b832a25..9b23254ae38dfdeac05ff3dcf6f1ac32626bb0d2 100644
--- a/content/page/download.md
+++ b/content/page/download.md
@@ -24,7 +24,9 @@ list](https://lists.sourceforge.net/lists/listinfo/briar-announce).
If you're interested in getting involved or following the progress of
the project, please [join the development mailing
list](https://lists.sourceforge.net/lists/listinfo/briar-devel) or email
-<contact@briarproject.org> \[[PGP key](/keys/contact.asc)\].
+{{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
All our software is open source - you can [browse the source
code](https://code.briarproject.org/briar/briar/tree/master) or [build
diff --git a/content/page/get-involved.md b/content/page/get-involved.md
index a4598490dba1f5fad4650c26eaefa283bdeabf08..7bc987e09101e433230eeae44b01111edf808d1e 100644
--- a/content/page/get-involved.md
+++ b/content/page/get-involved.md
@@ -12,7 +12,9 @@ experienced contributors.
If you're interested in getting involved or following the progress of
the project, please [join the development mailing
list](https://lists.sourceforge.net/lists/listinfo/briar-devel) or email
-<contact@briarproject.org> \[[PGP key](/keys/contact.asc)\]. Translators
+{{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}. Translators
can volunteer through our [Transifex
project](https://transifex.com/otf/briar).
diff --git a/content/page/hiring.md b/content/page/hiring.md
index bd252c185a1635a6936a5eb596b1cc29435cfd4e..e09da74fe7869b01b0bdf94b72d1f9893c51585d 100644
--- a/content/page/hiring.md
+++ b/content/page/hiring.md
@@ -5,8 +5,9 @@ title: Sorry, We're Not Currently Hiring
---
We don't currently have any paid positions available. If you'd like to
-hear about future vacancies, please email <contact@briarproject.org>
-\[[PGP key](/keys/contact.asc)\].
+hear about future vacancies, please email {{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/page/privacy.md b/content/page/privacy.md
index 09ac88faa24ce290620e48621fae5162544e2e69..f37cf48e0b21e6ef56fb7301d10245436dca165e 100644
--- a/content/page/privacy.md
+++ b/content/page/privacy.md
@@ -40,4 +40,6 @@ policy](https://slashdotmedia.com/privacy-statement/) applies to the
mailing lists. The list archives are public.
If you have any questions about our privacy policy, please email
-<contact@briarproject.org> \[[PGP key](/keys/contact.asc)\].
+{{<hidingemail
+ email="gro.tcejorprairb@tcatnoc"
+ pgplink="/keys/contact.asc" >}}.
diff --git a/themes/briar/layouts/shortcodes/hidingemail.html b/themes/briar/layouts/shortcodes/hidingemail.html
new file mode 100644
index 0000000000000000000000000000000000000000..2d31b5d1ad172a578bf7196e237adea036674071
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/hidingemail.html
@@ -0,0 +1,2 @@
+{{.Get "name" }} <span class="reverse">{{.Get "email" }}</span>
+[<a href="{{.Get "pgplink" }}">PGP key</a>]<F12>