From 72a4b075d6201baa438462937420fcef4c677f23 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 12 Sep 2013 17:08:02 -0400
Subject: [PATCH] Mail popup: respect "remote inline images" prefs

Fixes #2417
---
 UI/Templates/MailerUI/UIxMailPopupView.wox | 1 +
 UI/WebServerResources/UIxMailPopupView.js  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index 1b77d6622..1ae438566 100644
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -7,6 +7,7 @@
     className="UIxPageFrame"
     title="title"
     const:jsFiles="SOGoAutoCompletion.js"
+    const:userDefaultsKeys="SOGoMailDisplayRemoteInlineImages"
     const:popup="YES">
   <script type="text/javascript">
     var messageName = '<var:string value="clientObject.relativeImap4Name"/>';
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index d92fc0bf3..e5b619375 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -13,6 +13,9 @@ function initPopupMailer(event) {
     configureLoadImagesButton();
     configureSignatureFlagImage();
 
+    if (UserDefaults["SOGoMailDisplayRemoteInlineImages"] == 'always')
+        loadRemoteImages();
+
     window.messageUID = mailboxName + "/" + messageName;
 
     handleReturnReceipt();