v2.1.7-beta

Add newsletter commands to API docs
Add button to delete all Imgur/Cloudinary uploads
2018-05-13 12:10:12 -07:00 · 2018-05-13 11:46:58 -07:00 · 2018-05-13 11:29:59 -07:00 · 2018-05-12 12:16:33 -07:00 · 2018-05-11 21:43:26 -07:00 · 2018-05-11 21:23:19 -07:00
29 changed files with 1720 additions and 1186 deletions
--- a/API.md
+++ b/API.md
@@ -32,6 +32,21 @@ General optional parameters:

 ## API methods

+### add_newsletter_config
+Add a new notification agent.
+
+```
+Required parameters:
+    agent_id (int):           The newsletter type to add
+
+Optional parameters:
+    None
+
+Returns:
+    None
+```
+
+
 ### add_notifier_config
 Add a new notification agent.

@@ -93,27 +108,30 @@ Returns:
 Delete and recreate the cache directory.


-### delete_image_cache
-Delete and recreate the image cache directory.
-
-
-### delete_imgur_poster
-Delete the Imgur poster.
+### delete_hosted_images
+Delete the images uploaded to image hosting services.

 ```
 Required parameters:
+    None
+
+Optional parameters:
    rating_key (int):       1234
                            (Note: Must be the movie, show, season, artist, or album rating key)
-Optional parameters:
-    None
+    service (str):          'imgur' or 'cloudinary'
+    delete_all (bool):      'true' to delete all images form the service

 Returns:
    json:
        {"result": "success",
-         "message": "Deleted Imgur poster."}
+         "message": "Deleted hosted images from Imgur."}
 ```


+### delete_image_cache
+Delete and recreate the image cache directory.
+
+
 ### delete_library
 Delete a library section from Tautulli. Also erases all history for the library.

@@ -191,6 +209,36 @@ Returns:
 ```


+### delete_newsletter
+Remove a newsletter from the database.
+
+```
+Required parameters:
+    newsletter_id (int):        The newsletter to delete
+
+Optional parameters:
+    None
+
+Returns:
+    None
+```
+
+
+### delete_newsletter_log
+Delete the Tautulli newsletter logs.
+
+```
+Required paramters:
+    None
+
+Optional parameters:
+    None
+
+Returns:
+    None
+```
+
+
 ### delete_notification_log
 Delete the Tautulli notification logs.

@@ -916,9 +964,9 @@ Optional parameters:

 Returns:
    json:
-        [{"section_id": 1, "section_name": "Movies"},
-         {"section_id": 7, "section_name": "Music"},
-         {"section_id": 2, "section_name": "TV Shows"},
+        [{"section_id": 1, "section_name": "Movies", "section_type": "movie"},
+         {"section_id": 7, "section_name": "Music", "section_type": "artist"},
+         {"section_id": 2, "section_name": "TV Shows", "section_type": "show"},
         {...}
         ]
 ```
@@ -1166,6 +1214,109 @@ Returns:
 ```


+### get_newsletter_config
+Get the configuration for an existing notification agent.
+
+```
+Required parameters:
+    newsletter_id (int):        The newsletter config to retrieve
+
+Optional parameters:
+    None
+
+Returns:
+    json:
+        {"id": 1,
+         "agent_id": 0,
+         "agent_name": "recently_added",
+         "agent_label": "Recently Added",
+         "friendly_name": "",
+         "id_name": "",
+         "cron": "0 0 * * 1",
+         "active": 1,
+         "subject": "Recently Added to {server_name}! ({end_date})",
+         "body": "View the newsletter here: {newsletter_url}",
+         "message": "",
+         "config": {"custom_cron": 0,
+                    "filename": "newsletter_{newsletter_uuid}.html",
+                    "formatted": 1,
+                    "incl_libraries": ["1", "2"],
+                    "notifier_id": 1,
+                    "save_only": 0,
+                    "time_frame": 7,
+                    "time_frame_units": "days"
+                    },
+         "email_config": {...},
+         "config_options": [{...}, ...],
+         "email_config_options": [{...}, ...]
+         }
+```
+
+
+### get_newsletter_log
+Get the data on the Tautulli newsletter logs table.
+
+```
+Required parameters:
+    None
+
+Optional parameters:
+    order_column (str):             "timestamp", "newsletter_id", "agent_name", "notify_action",
+                                    "subject_text", "start_date", "end_date", "uuid"
+    order_dir (str):                "desc" or "asc"
+    start (int):                    Row to start from, 0
+    length (int):                   Number of items to return, 25
+    search (str):                   A string to search for, "Telegram"
+
+Returns:
+    json:
+        {"draw": 1,
+         "recordsTotal": 1039,
+         "recordsFiltered": 163,
+         "data":
+            [{"agent_id": 0,
+              "agent_name": "recently_added",
+              "end_date": "2018-03-18",
+              "id": 7,
+              "newsletter_id": 1,
+              "notify_action": "on_cron",
+              "start_date": "2018-03-05",
+              "subject_text": "Recently Added to Plex (Winterfell-Server)! (2018-03-18)",
+              "success": 1,
+              "timestamp": 1462253821,
+              "uuid": "7fe4g65i"
+              },
+             {...},
+             {...}
+             ]
+         }
+```
+
+
+### get_newsletters
+Get a list of configured newsletters.
+
+```
+Required parameters:
+    None
+
+Optional parameters:
+    None
+
+Returns:
+    json:
+        [{"id": 1,
+          "agent_id": 0,
+          "agent_name": "recently_added",
+          "agent_label": "Recently Added",
+          "friendly_name": "",
+          "cron": "0 0 * * 1",
+          "active": 1
+          }
+         ]
+```
+
+
 ### get_notification_log
 Get the data on the Tautulli notification logs table.

@@ -1174,8 +1325,8 @@ Required parameters:
    None

 Optional parameters:
-    order_column (str):             "timestamp", "agent_name", "notify_action",
-                                    "subject_text", "body_text", "script_args"
+    order_column (str):             "timestamp", "notifier_id", "agent_name", "notify_action",
+                                    "subject_text", "body_text",
    order_dir (str):                "desc" or "asc"
    start (int):                    Row to start from, 0
    length (int):                   Number of items to return, 25
@@ -1188,15 +1339,14 @@ Returns:
         "recordsFiltered": 163,
         "data":
            [{"agent_id": 13,
-              "agent_name": "Telegram",
-              "body_text": "Game of Thrones - S06E01 - The Red Woman [Transcode].",
+              "agent_name": "telegram",
+              "body_text": "DanyKhaleesi69 started playing The Red Woman.",
              "id": 1000,
-              "notify_action": "play",
-              "poster_url": "http://i.imgur.com/ZSqS8Ri.jpg",
+              "notify_action": "on_play",
              "rating_key": 153037,
-              "script_args": "[]",
              "session_key": 147,
              "subject_text": "Tautulli (Winterfell-Server)",
+              "success": 1,
              "timestamp": 1462253821,
              "user": "DanyKhaleesi69",
              "user_id": 8008135
@@ -1777,6 +1927,68 @@ Returns:
 ```


+### get_stream_data
+Get the stream details from history or current stream.
+
+```
+Required parameters:
+    row_id (int):       The row ID number for the history item, OR
+    session_key (int):  The session key of the current stream
+
+Optional parameters:
+    None
+
+Returns:
+    json:
+        {"aspect_ratio": "2.35",
+         "audio_bitrate": 231,
+         "audio_channels": 6,
+         "audio_codec": "aac",
+         "audio_decision": "transcode",
+         "bitrate": 2731,
+         "container": "mp4",
+         "current_session": "",
+         "grandparent_title": "",
+         "media_type": "movie",
+         "optimized_version": "",
+         "optimized_version_profile": "",
+         "optimized_version_title": "",
+         "pre_tautulli": "",
+         "quality_profile": "1.5 Mbps 480p",
+         "stream_audio_bitrate": 203,
+         "stream_audio_channels": 2,
+         "stream_audio_codec": "aac",
+         "stream_audio_decision": "transcode",
+         "stream_bitrate": 730,
+         "stream_container": "mkv",
+         "stream_container_decision": "transcode",
+         "stream_subtitle_codec": "",
+         "stream_subtitle_decision": "",
+         "stream_video_bitrate": 527,
+         "stream_video_codec": "h264",
+         "stream_video_decision": "transcode",
+         "stream_video_framerate": "24p",
+         "stream_video_height": 306,
+         "stream_video_resolution": "SD",
+         "stream_video_width": 720,
+         "subtitle_codec": "",
+         "subtitles": "",
+         "synced_version": "",
+         "synced_version_profile": "",
+         "title": "Frozen",
+         "transcode_hw_decoding": "",
+         "transcode_hw_encoding": "",
+         "video_bitrate": 2500,
+         "video_codec": "h264",
+         "video_decision": "transcode",
+         "video_framerate": "24p",
+         "video_height": 816,
+         "video_resolution": "1080",
+         "video_width": 1920
+         }
+```
+
+
 ### get_stream_type_by_top_10_platforms
 Get graph data by stream type by top 10 platforms.

@@ -2215,6 +2427,23 @@ Returns:
 ```


+### notify_newsletter
+Send a newsletter using Tautulli.
+
+```
+Required parameters:
+    newsletter_id (int):    The ID number of the newsletter agent
+
+Optional parameters:
+    subject (str):          The subject of the newsletter
+    body (str):             The body of the newsletter
+    message (str):          The message of the newsletter
+
+Returns:
+    None
+```
+
+
 ### notify_recently_added
 Send a recently added notification using Tautulli.

@@ -2244,8 +2473,12 @@ Required parameters:
    rating_key (str):       54321

 Optional parameters:
-    width (str):            150
-    height (str):           255
+    width (str):            300
+    height (str):           450
+    opacity (str):          25
+    background (str):       282828
+    blur (str):             3
+    img_format (str):       png
    fallback (str):         "poster", "cover", "art"
    refresh (bool):         True or False whether to refresh the image cache

@@ -2326,6 +2559,22 @@ Returns:
 ```


+### set_newsletter_config
+Configure an exisitng newsletter agent.
+
+```
+Required parameters:
+    newsletter_id (int):    The newsletter config to update
+    agent_id (int):         The newsletter type of the newsletter
+
+Optional parameters:
+    Pass all the config options for the agent with the 'newsletter_config_' and 'newsletter_email_' prefix.
+
+Returns:
+    None
+```
+
+
 ### set_notifier_config
 Configure an exisitng notificaiton agent.

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,60 @@
 # Changelog

+## v2.1.7-beta (2018-05-13)
+
+* Newsletters:
+  * New: Option to toggle between inline or internal CSS style templates.
+  * New: Button to delete all uploaded images from Imgur/Cloudinary.
+  * Fix: Long titles overflowing the newsletter cards.
+  * Change: Self-hosted images on newsletters to use the /image endpoint instead of proxying through /newsletter/image.
+  * Change: Strip whitespace from newsletter for smaller file size before sending to email.
+* API:
+  * New: Added get_stream_data command to API.
+  * New: Added newsletter API commands to documentation.
+
+
+## v2.1.6-beta (2018-05-09)
+
+* Newsletters:
+  * Change: Setting to specify static URL ID name instead of using the newsletter ID number.
+  * Change: Reorganize newsletter config options.
+
+
+## v2.1.5-beta (2018-05-07)
+
+* Newsletters:
+  * New: Added setting for a custom newsletter template folder.
+  * New: Added option to enable static newsletter URLs to retrieve the last sent scheduled newsletter.
+  * New: Added ability to change the newsletter output directory and filenames.
+  * New: Added option to save the newsletter file without sending it to a notification agent.
+  * Fix: Check for disabled image hosting setting.
+  * Fix: Cache newsletter images when refreshing the page.
+  * Fix: Refresh image from the Plex server when uploading to image hosting.
+  * Change: Allow all image hosting options with self-hosted newsletters.
+* UI:
+  * Change: Don't retrieve recently added on the homepage if the Plex Cloud server is sleeping.
+* Other:
+  * Fix: Imgur database upgrade migration.
+
+
+## v2.1.4 (2018-05-05)
+
+* Newsletters:
+  * Fix: Newsletter URL without an HTTP root.
+
+
+## v2.1.3-beta (2018-05-04)
+
+* Newsletters:
+  * Fix: HTTP root doubled in newsletter URL.
+  * Fix: Configuration would not open with failed hostname resolution.
+  * Fix: Schedule one day off when using weekday names in cron.
+  * Fix: Images not refreshing when changed in Plex.
+  * Fix: Cloudinary upload with non-ASCII image titles.
+* Other:
+  * Fix: Potential XSS vulnerability in search.
+
+
 ## v2.1.2-beta (2018-05-01)

 * Newsletters:
--- a/data/interfaces/default/configuration_table.html
+++ b/data/interfaces/default/configuration_table.html
@@ -69,7 +69,7 @@ DOCUMENTATION :: END
        % endif
        <tr>
            <td>Platform:</td>
-            <td>${common.PLATFORM} ${common.PLATFORM_VERSION}</td>
+            <td>${common.PLATFORM} ${common.PLATFORM_RELEASE} (${common.PLATFORM_VERSION + (' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '')})</td>
        </tr>
        <tr>
            <td>Python Version:</td>
--- a/data/interfaces/default/css/tautulli.css
+++ b/data/interfaces/default/css/tautulli.css
@@ -70,6 +70,7 @@ div.form-control .selectize-input {
    background-color: #555;
    border-radius: 3px;
    transition: background-color .3s;
+    height: 32px !important;
 }
 .react-selectize.root-node .react-selectize-control,
 .selectize-control.form-control .selectize-input {
@@ -4092,4 +4093,9 @@ a:hover .overlay-refresh-image:hover {
 }
 a[data-tab-destination] {
    cursor: pointer;
+}
+.modal-config-section {
+    margin-top: 10px !important;
+    padding-top: 10px;
+    border-top: 1px solid #444;
 }
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -5,6 +5,7 @@
 </%def>

 <%def name="body()">
+<% from plexpy import PLEX_SERVER_UP %>
 <div class="container-fluid">
    % for section in config['home_sections']:
    % if section == 'current_activity':
@@ -22,7 +23,6 @@
                </h3>
            </div>
            <div id="currentActivity">
-                <% from plexpy import PLEX_SERVER_UP %>
                % if PLEX_SERVER_UP:
                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
                % elif config['pms_is_cloud']:
@@ -135,7 +135,17 @@
    <div class="row">
        <div class="col-md-12">
            <div id="recentlyAdded" style="margin-right: -15px;">
+                % if PLEX_SERVER_UP:
                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Looking for new items...</div>
+                % elif config['pms_is_cloud']:
+                <div class="text-muted">Plex Cloud server is sleeping.</div>
+                % else:
+                <div class="text-muted">There was an error communicating with your Plex Server.
+                    % if _session['user_group'] == 'admin':
+                    Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.
+                    % endif
+                </div>
+                % endif
                <br>
            </div>
        </div>
@@ -222,6 +232,7 @@
 </%def>

 <%def name="javascriptIncludes()">
+<% from plexpy import PLEX_SERVER_UP %>
 <script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/jquery.scrollbar.min.js"></script>
 <script src="${http_root}js/jquery.mousewheel.min.js"></script>
@@ -254,7 +265,6 @@
        });
    }
 </script>
-<% from plexpy import PLEX_SERVER_UP %>
 % if 'current_activity' in config['home_sections'] and PLEX_SERVER_UP:
 <script>
    var defaultHandler = {
@@ -746,7 +756,7 @@
    getLibraryStats();
 </script>
 % endif
-% if 'recently_added' in config['home_sections']:
+% if 'recently_added' in config['home_sections'] and PLEX_SERVER_UP:
 <script>
    function recentlyAdded(recently_added_count, recently_added_type) {
        showMsg("Loading recently added items...", true, false, 0);
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -1,17 +1,17 @@
-function initConfigCheckbox(elem) {
-    var config = $(elem).closest('div').next();
+function initConfigCheckbox(elem, toggleElem = null, reverse = false) {
+    var config = toggleElem ? $(toggleElem) : $(elem).closest('div').next();
    config.css('overflow', 'hidden');
    if ($(elem).is(":checked")) {
-        config.show();
+        config.toggle(!reverse);
    } else {
-        config.hide();
+        config.toggle(reverse);
    }
    $(elem).click(function () {
-        var config = $(this).closest('div').next();
+        var config = toggleElem ? $(toggleElem) : $(this).closest('div').next();
        if ($(this).is(":checked")) {
-            config.slideDown();
+            config.slideToggleBool(!reverse);
        } else {
-            config.slideUp();
+            config.slideToggleBool(reverse);
        }
    });
 }
@@ -449,4 +449,8 @@ function forceMinMax(elem) {

 function capitalizeFirstLetter(string) {
    return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+$.fn.slideToggleBool = function(bool, options) {
+  return bool ? $(this).slideDown(options) : $(this).slideUp(options);
 }
--- a/data/interfaces/default/newsletter_config.html
+++ b/data/interfaces/default/newsletter_config.html
@@ -20,7 +20,7 @@
                <div class="row">
                    <ul class="nav nav-tabs list-unstyled" role="tablist">
                        <li role="presentation" class="active"><a href="#tabs-newsletter_config" aria-controls="tabs-newsletter_config" role="tab" data-toggle="tab">Configuration</a></li>
-                        <li role="presentation"><a href="#tabs-newsletter_agent" aria-controls="tabs-newsletter_agent" role="tab" data-toggle="tab">Notification Agent</a></li>
+                        <li role="presentation"><a href="#tabs-newsletter_saving_sending" aria-controls="tabs-newsletter_saving_sending" role="tab" data-toggle="tab">Saving & Sending</a></li>
                        <li role="presentation"><a href="#tabs-newsletter_text" aria-controls="tabs-newsletter_text" role="tab" data-toggle="tab">Newsletter Text</a></li>
                        <li role="presentation"><a href="#tabs-test_newsletter" aria-controls="tabs-test_newsletter" role="tab" data-toggle="tab">Test Newsletter</a></li>
                    </ul>
@@ -70,7 +70,7 @@
                                        <p class="help-block">Set the time frame to include in the newsletter. Note: Days uses calendar days (i.e. since midnight).</p>
                                    </div>
                                </div>
-                                <div class="col-md-12" style="padding-top: 10px; border-top: 1px solid #444;">
+                                <div class="col-md-12 modal-config-section">
                                    <input type="hidden" id="newsletter_id" name="newsletter_id" value="${newsletter['id']}" />
                                    <input type="hidden" id="agent_id" name="agent_id" value="${newsletter['agent_id']}" />
                                    % for item in newsletter['config_options']:
@@ -165,7 +165,16 @@
                                    % endif
                                    % endfor
                                </div>
-                                <div class="col-md-12" style="margin-top: 10px; padding-top: 10px; border-top: 1px solid #444;">
+                                <div class="col-md-12 modal-config-section">
+                                    <div class="form-group">
+                                        <label for="id_name">Unique ID Name</label>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <input type="text" class="form-control" id="id_name" name="id_name" value="${newsletter['id_name']}" size="30">
+                                            </div>
+                                        </div>
+                                        <p class="help-block">Optional: Enter a unique ID name to create a static URL to the last sent scheduled newsletter at <span class="inline-pre">${http_root}newsletter/id/&lt;id_name&gt;</span>. Only letters (a-z), numbers (0-9), underscores (_) and hyphens (-) are allowed. Leave blank to disable.</p>
+                                    </div>
                                    <div class="form-group">
                                        <label for="friendly_name">Description</label>
                                        <div class="row">
@@ -178,12 +187,32 @@
                                </div>
                            </div>
                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-newsletter_agent">
+                        <div role="tabpanel" class="tab-pane" id="tabs-newsletter_saving_sending">
                            <div class="row">
                                <div class="col-md-12">
+                                    <label>Saving</label>
                                    <div class="checkbox">
                                        <label>
-                                            <input type="checkbox" id="newsletter_config_formatted_checkbox" data-id="newsletter_config_formatted" class="checkboxes" value="1" ${checked(newsletter['config']['formatted'])}> Send newsletter as an HTML formatted Email
+                                            <input type="checkbox" id="newsletter_config_save_only_checkbox" data-id="newsletter_config_save_only" class="checkboxes" value="1" ${checked(newsletter['config']['save_only'])}> Save HTML File Only
+                                        </label>
+                                        <p class="help-block">Enable to save the newsletter HTML file without sending it to any notification agent.</p>
+                                        <input type="hidden" id="newsletter_config_save_only" name="newsletter_config_save_only" value="${newsletter['config']['save_only']}">
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="newsletter_config_filename">HTML File Name</label>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <input type="text" class="form-control" id="newsletter_config_filename" name="newsletter_config_filename" value="${newsletter['config']['filename']}" size="30">
+                                            </div>
+                                        </div>
+                                        <p class="help-block">Optional: Enter the file name to use when saving the newsletter (ending with <span class="inline-pre">.html</span>). You may use any of the <a href="#newsletter-text-sub-modal" data-toggle="modal">newsletter text parameters</a>. Leave blank for default.</p>
+                                    </div>
+                                </div>
+                                <div class="col-md-12 modal-config-section" id="newsletter_agent_options">
+                                    <label>Sending</label>
+                                    <div class="checkbox">
+                                        <label>
+                                            <input type="checkbox" id="newsletter_config_formatted_checkbox" data-id="newsletter_config_formatted" class="checkboxes" value="1" ${checked(newsletter['config']['formatted'])}> Send Newsletter as an HTML Formatted Email
                                        </label>
                                        <p class="help-block">Enable to send the newsletter as an HTML formatted Email. Disable to only send a subject and body message to a different notification agent.</p>
                                        <input type="hidden" id="newsletter_config_formatted" name="newsletter_config_formatted" value="${newsletter['config']['formatted']}">
@@ -234,100 +263,100 @@
                                            Note: Self-hosted newsletters must be enabled under <a data-tab-destination="tabs-notifications" data-dismiss="modal" data-target="#newsletter_self_hosted">Newsletters</a> to include a link to the newsletter.
                                        </p>
                                    </div>
-                                </div>
-                                <div id="newsletter-email-config" class="col-md-12" style="padding-top: 10px; border-top: 1px solid #444;">
-                                    % for item in newsletter['email_config_options']:
-                                    % if item['input_type'] == 'help':
-                                    <div class="form-group">
-                                        <label>${item['label']}</label>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'text' or item['input_type'] == 'password':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" ${'readonly' if item.get('readonly') else ''}>
-                                            </div>
+                                    <div id="newsletter-email-config">
+                                        % for item in newsletter['email_config_options']:
+                                        % if item['input_type'] == 'help':
+                                        <div class="form-group">
+                                            <label>${item['label']}</label>
+                                            <p class="help-block">${item['description'] | n}</p>
                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'number':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-3">
-                                                <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30">
+                                        % elif item['input_type'] == 'text' or item['input_type'] == 'password':
+                                        <div class="form-group">
+                                            <label for="${item['name']}">${item['label']}</label>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" ${'readonly' if item.get('readonly') else ''}>
+                                                </div>
                                            </div>
+                                            <p class="help-block">${item['description'] | n}</p>
                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'button':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="button" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
+                                        % elif item['input_type'] == 'number':
+                                        <div class="form-group">
+                                            <label for="${item['name']}">${item['label']}</label>
+                                            <div class="row">
+                                                <div class="col-md-3">
+                                                    <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30">
+                                                </div>
                                            </div>
+                                            <p class="help-block">${item['description'] | n}</p>
                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'checkbox' and item['name'] != 'newsletter_email_html_support':
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" ${checked(item['value'])}> ${item['label']}
-                                        </label>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                        <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                    </div>
-                                    % elif item['input_type'] == 'select':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}">
-                                                    % for key, value in sorted(item['select_options'].iteritems()):
-                                                    % if key == item['value']:
-                                                    <option value="${key}" selected>${value}</option>
-                                                    % else:
-                                                    <option value="${key}">${value}</option>
-                                                    % endif
-                                                    % endfor
-                                                </select>
+                                        % elif item['input_type'] == 'button':
+                                        <div class="form-group">
+                                            <label for="${item['name']}">${item['label']}</label>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <input type="button" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
+                                                </div>
                                            </div>
+                                            <p class="help-block">${item['description'] | n}</p>
                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'selectize':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}">
-                                                    <option value="select-all">Select All</option>
-                                                    <option value="remove-all">Remove All</option>
-                                                    % if isinstance(item['select_options'], dict):
-                                                    % for section, options in item['select_options'].iteritems():
-                                                    <optgroup label="${section}">
-                                                        % for option in sorted(options, key=lambda x: x['text'].lower()):
+                                        % elif item['input_type'] == 'checkbox' and item['name'] != 'newsletter_email_html_support':
+                                        <div class="checkbox">
+                                            <label>
+                                                <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" ${checked(item['value'])}> ${item['label']}
+                                            </label>
+                                            <p class="help-block">${item['description'] | n}</p>
+                                            <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
+                                        </div>
+                                        % elif item['input_type'] == 'select':
+                                        <div class="form-group">
+                                            <label for="${item['name']}">${item['label']}</label>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <select class="form-control" id="${item['name']}" name="${item['name']}">
+                                                        % for key, value in sorted(item['select_options'].iteritems()):
+                                                        % if key == item['value']:
+                                                        <option value="${key}" selected>${value}</option>
+                                                        % else:
+                                                        <option value="${key}">${value}</option>
+                                                        % endif
+                                                        % endfor
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <p class="help-block">${item['description'] | n}</p>
+                                        </div>
+                                        % elif item['input_type'] == 'selectize':
+                                        <div class="form-group">
+                                            <label for="${item['name']}">${item['label']}</label>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <select class="form-control" id="${item['name']}" name="${item['name']}">
+                                                        <option value="select-all">Select All</option>
+                                                        <option value="remove-all">Remove All</option>
+                                                        % if isinstance(item['select_options'], dict):
+                                                        % for section, options in item['select_options'].iteritems():
+                                                        <optgroup label="${section}">
+                                                            % for option in sorted(options, key=lambda x: x['text'].lower()):
+                                                                <option value="${option['value']}">${option['text']}</option>
+                                                            % endfor
+                                                        </optgroup>
+                                                        % endfor
+                                                        % else:
+                                                        <option value="border-all"></option>
+                                                        % for option in sorted(item['select_options'], key=lambda x: x['text'].lower()):
                                                            <option value="${option['value']}">${option['text']}</option>
                                                        % endfor
-                                                    </optgroup>
-                                                    % endfor
-                                                    % else:
-                                                    <option value="border-all"></option>
-                                                    % for option in sorted(item['select_options'], key=lambda x: x['text'].lower()):
-                                                        <option value="${option['value']}">${option['text']}</option>
-                                                    % endfor
-                                                    % endif
-                                                </select>
+                                                        % endif
+                                                    </select>
+                                                </div>
                                            </div>
+                                            <p class="help-block">${item['description'] | n}</p>
                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
+                                        % endif
+                                        % endfor
+                                        <input type="hidden" id="newsletter_email_html_support" name="newsletter_email_html_support" value="1">
                                    </div>
-                                    % endif
-                                    % endfor
-                                    <input type="hidden" id="newsletter_email_html_support" name="newsletter_email_html_support" value="1">
                                </div>
                            </div>
                        </div>
@@ -458,6 +487,26 @@
        toggleCustomCron();
    });

+    function validateFilename() {
+        var filename = $('#newsletter_config_filename').val();
+        if (filename !== '' && !(filename.endsWith('.html'))) {
+            showMsg('<i class="fa fa-times"></i> Failed to save newsletter. Invalid file name.', false, true, 5000, true);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function validateIDName() {
+        var id_name = $('#id_name').val();
+        if (/^[a-zA-Z0-9_-]*$/.test(id_name)) {
+            return true;
+        } else {
+            showMsg('<i class="fa fa-times"></i> Failed to save newsletter. Invalid unique ID name.', false, true, 5000, true);
+            return false;
+        }
+    }
+
    var $incl_libraries = $('#newsletter_config_incl_libraries').selectize({
        plugins: ['remove_button'],
        maxItems: null,
@@ -485,6 +534,8 @@
    var incl_libraries = $incl_libraries[0].selectize;
    incl_libraries.setValue(${json.dumps(next((c['value'] for c in newsletter['config_options'] if c['name'] == 'newsletter_config_incl_libraries'), [])) | n});

+    initConfigCheckbox('#newsletter_config_save_only_checkbox', '#newsletter_agent_options', true);
+
    function toggleEmailSelect () {
        if ($('#newsletter_config_formatted_checkbox').is(':checked')) {
            $('#newsletter_body').hide();
@@ -643,7 +694,9 @@
        if ($('#custom_cron').val() === '0'){
            $("#cron_value").val(cron_widget.cron('value'));
        }
-        doAjaxCall('set_newsletter_config', $(this), 'tabs', true, true, saveCallback);
+        if (validateFilename() && validateIDName()){
+            doAjaxCall('set_newsletter_config', $(this), 'tabs', true, true, saveCallback);
+        }
    }

    $('#delete-newsletter-item').click(function () {
--- a/data/interfaces/default/newsletter_preview.html
+++ b/data/interfaces/default/newsletter_preview.html
@@ -32,7 +32,7 @@
 <script>
 $(document).ready(function () {
    var frame = $('<iframe></iframe>', {
-        src: '${http_root}real_newsletter?${urllib.urlencode(kwargs) | n}',
+        src: 'real_newsletter?${urllib.urlencode(kwargs) | n}',
        frameborder: '0',
        style: 'display: none; height: 100vh; width: 100vw;'
    });
--- a/data/interfaces/default/notifier_config.html
+++ b/data/interfaces/default/notifier_config.html
@@ -123,7 +123,7 @@
                                    % endif
                                    % endfor
                                </div>
-                                <div class="col-md-12" style="margin-top: 10px; padding-top: 10px; border-top: 1px solid #444;">
+                                <div class="col-md-12 modal-config-section">
                                    <div class="form-group">
                                        <label for="friendly_name">Description</label>
                                        <div class="row">
--- a/data/interfaces/default/search.html
+++ b/data/interfaces/default/search.html
@@ -28,15 +28,17 @@

 <%def name="javascriptIncludes()">
 <script>
+    var query_string = "${query.replace('"','\\"').replace('/','\\/') | n}";
+
    $('#search_button').removeClass('btn-inactive');
-    $('#query').val("${query.replace('"','\\"') | n}").css({ right: '0', width: '250px' }).addClass('active');
+    $('#query').val(query_string).css({ right: '0', width: '250px' }).addClass('active');

    $.ajax({
        url: 'get_search_results_children',
-        type: "GET",
+        type: "POST",
        async: true,
        data: {
-            query: "${query.replace('"','\\"') | n}",
+            query: query_string,
            limit: 30
        },
        complete: function (xhr, status) {
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -702,6 +702,17 @@
                                The server URL that Tautulli will use to connect to your Plex server. Retrieved automatically.
                            </p>
                        </div>
+                        <div class="form-group advanced-setting">
+                            <label for="pms_url">Plex Server Identifier</label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input type="text" class="form-control" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}" size="30" readonly>
+                                </div>
+                            </div>
+                            <p class="help-block">
+                                The unique identifier for your Plex server. Retrieved automatically.
+                            </p>
+                        </div>
                        <div class="checkbox advanced-setting">
                            <label>
                                <input type="checkbox" class="pms-settings" id="pms_url_manual" name="pms_url_manual" value="1" ${config['pms_url_manual']}> Manual Connection
@@ -728,7 +739,6 @@
                        </div>

                        <input type="hidden" id="pms_is_cloud" name="pms_is_cloud" value="${config['pms_is_cloud']}">
-                        <input type="hidden" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
                        <input type="checkbox" name="server_changed" id="server_changed" value="1" style="display: none;">

                        <div class="form-group advanced-setting">
@@ -956,12 +966,39 @@
                        </div>
                        <div id="self_host_newsletter_options" style="overlfow: hidden; display: ${'block' if config['newsletter_self_hosted'] == 'checked' else 'none'}">
                            <p class="help-block" id="self_host_newsletter_message">
-                                Note: The <span class="inline-pre">${http_root}newsletter</span> endpoint on your domain must be publicly accessible from the internet.<br>
-                                Note: Newsletter images will be self-hosted regardless of the Image Hosting setting below.<br>
+                                Note: The <span class="inline-pre">${http_root}newsletter</span> endpoint on your domain must be publicly accessible from the internet.
                            </p>
                            <p class="help-block settings-warning base-url-warning">Warning: Public Tautulli domain not set under <a data-tab-destination="tabs-web_interface" data-target="#http_base_url">Web Interface</a>.</p>
                        </div>

+                        <div class="checkbox advanced-setting">
+                            <label>
+                                <input type="checkbox" id="newsletter_inline_styles" name="newsletter_inline_styles" value="1" ${config['newsletter_inline_styles']}> Use Inline Styles Template
+                            </label>
+                            <p class="help-block">
+                                Enable to use newsletter templates with inline CSS styles. Inline styles render better in email clients, but are larger in size which may cause long newsletters to be clipped.<br>
+                                Note: This setting does not affect custom templates. CSS styles will depend on your own template.
+                            </p>
+                        </div>
+                        <div class="form-group advanced-setting">
+                            <label for="newsletter_dir">Custom Newsletter Templates Folder</label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input type="text" class="form-control" id="newsletter_custom_dir" name="newsletter_custom_dir" value="${config['newsletter_custom_dir']}">
+                                </div>
+                            </div>
+                            <p class="help-block">Optional: Enter the full path to your custom newsletter templates folder. Leave blank for default.</p>
+                        </div>
+                        <div class="form-group advanced-setting">
+                            <label for="newsletter_dir">Newsletter Output Directory</label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input type="text" class="form-control" id="newsletter_dir" name="newsletter_dir" value="${config['newsletter_dir']}">
+                                </div>
+                            </div>
+                            <p class="help-block">Enter the full path to where newsletter files will be saved.</p>
+                        </div>
+
                        <div class="padded-header">
                            <h3>3rd Party APIs</h3>
                        </div>
@@ -970,12 +1007,19 @@
                            <label for="notify_upload_posters">Image Hosting</label>
                            <div class="row">
                                <div class="col-md-6">
-                                    <select class="form-control" id="notify_upload_posters" name="notify_upload_posters">
-                                        <option value="0" ${'selected' if config['notify_upload_posters'] == 0 else ''}>Disabled</option>
-                                        <option value="1" ${'selected' if config['notify_upload_posters'] == 1 else ''}>Imgur</option>
-                                        <option value="3" ${'selected' if config['notify_upload_posters'] == 3 else ''}>Cloudinary</option>
-                                        <option value="2" ${'selected' if config['notify_upload_posters'] == 2 else ''}>Self-hosted on public Tautulli domain</option>
-                                    </select>
+                                    <div class="${'input-group' if config['notify_upload_posters'] in (1, 3) else ''}">
+                                        <select class="form-control" id="notify_upload_posters" name="notify_upload_posters">
+                                            <option value="0" ${'selected' if config['notify_upload_posters'] == 0 else ''}>Disabled</option>
+                                            <option value="1" ${'selected' if config['notify_upload_posters'] == 1 else ''}>Imgur</option>
+                                            <option value="3" ${'selected' if config['notify_upload_posters'] == 3 else ''}>Cloudinary</option>
+                                            <option value="2" ${'selected' if config['notify_upload_posters'] == 2 else ''}>Self-hosted on public domain</option>
+                                        </select>
+                                        % if config['notify_upload_posters'] in (1, 3):
+                                        <span class="input-group-btn" id="delete_all_uploads_container">
+                                            <button class="btn btn-form" type="button" id="delete_all_uploads">Delete All Uploads</button>
+                                        </span>
+                                        % endif
+                                    </div>
                                </div>
                            </div>
                            <p class="help-block">Select where to host Plex images for notifications and newsletters.</p>
@@ -1084,7 +1128,7 @@
                            Add a new newsletter agent, or configure an existing newsletter agent by clicking the settings icon on the right.
                        </p>
                        <p class="help-block settings-warning" id="newsletter_upload_warning">
-                            Note: Either <a data-tab-destination="tabs-notifications" data-target="#notify_upload_posters">Image Hosting</a> or <a data-tab-destination="tabs-notifications" data-target="#newsletter_self_hosted">Self-Hosted Newsletters</a> must be enabled.</span>
+                            Warning: The <a data-tab-destination="tabs-notifications" data-target="#notify_upload_posters">Image Hosting</a> setting must be enabled for images to display on the newsletter.</span>
                        </p>
                        <br/>
                        <div id="plexpy-newsletters-table">
@@ -1173,14 +1217,6 @@
                                </div>
                            </div>
                        </div>
-                        <div class="form-group">
-                            <label for="newsletter_dir">Newsletter Directory</label>
-                            <div class="row">
-                                <div class="col-md-6">
-                                    <input type="text" class="form-control directory-settings" id="newsletter_dir" name="newsletter_dir" value="${config['newsletter_dir']}">
-                                </div>
-                            </div>
-                        </div>

                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>

@@ -2586,11 +2622,37 @@ $(document).ready(function() {
        } else {
            $('#cloudinary_upload_options').slideUp();
        }
+        var parent;
+        if (upload_val === '1' || upload_val === '3') {
+            parent = $('#notify_upload_posters').parent();
+            if ($('#delete_all_uploads_container').length === 0){
+                parent.addClass('input-group');
+                parent.append(
+                    '<span class="input-group-btn" id="delete_all_uploads_container">' +
+                    '<button class="btn btn-form" type="button" id="delete_all_uploads">Delete All Uploads</button>' +
+                    '</span>');
+            }
+        } else {
+            parent = $('#notify_upload_posters').parent();
+            parent.removeClass('input-group');
+            $('#delete_all_uploads_container').remove();
+        }
    }
    $('#notify_upload_posters').change(function () {
        imageUpload();
    });

+    $('body').on('click', '#delete_all_uploads', function () {
+        var image_hosting_option = $('#notify_upload_posters').find(':selected');
+        var name = image_hosting_option.text();
+
+        var msg = 'Are you sure you want to delete all uploaded images on <strong>' + name + '</strong>?' +
+            '<br />All previous links to the images will no longer work. This cannot be undone!';
+        var url = 'delete_hosted_images';
+        var data = { service: name, delete_all: true };
+        confirmAjaxCall(url, msg, data, false);
+    });
+
    function baseURLSet() {
        if ($('#http_base_url').val()) {
            $('.base-url-warning').hide();
@@ -2605,10 +2667,10 @@ $(document).ready(function() {
    });

    function newsletterUploadEnabled() {
-        if ($('#notify_upload_posters').val() !== '2' || $('#newsletter_self_hosted').is(':checked')) {
-            $('#newsletter_upload_warning').hide();
-        } else {
+        if ($('#notify_upload_posters').val() === '0') {
            $('#newsletter_upload_warning').show();
+        } else {
+            $('#newsletter_upload_warning').hide();
        }
    }
    newsletterUploadEnabled();
--- a/data/interfaces/default/update_metadata.html
+++ b/data/interfaces/default/update_metadata.html
@@ -188,7 +188,7 @@ DOCUMENTATION :: END
            },
            complete: function (xhr, status) {
                $('#search-results-list').html(xhr.responseText);
-                $('#update_query_title').html(query_string)
+                $('#update_query_title').text(query_string)
            }
        });
    }
--- a/data/interfaces/newsletters/recently_added.html
+++ b/data/interfaces/newsletters/recently_added.html
@@ -1,17 +1,24 @@
 % if data:
 <%
    import plexpy
-    from plexpy.helpers import grouper
+    from plexpy.helpers import grouper, get_img_service

    recently_added = data['recently_added']
    if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
        base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
-        base_url_image = base_url + 'image/'
    elif preview:
        base_url = 'newsletter/'
-        base_url_image = base_url + 'image/'
    else:
-        base_url = base_url_image = ''
+        base_url = ''
+
+    service = get_img_service(include_self=True)
+    if service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
+        base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'image/'
+    elif preview and service and service != 'self-hosted':
+        base_url_image = 'image/'
+    else:
+        base_url_image = ''
+
 %>
 <!doctype html>
 <html>
@@ -61,17 +68,14 @@
            width: 100%;
        }

-        /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
        .container {
            display: block;
            margin: 0 auto !important;
-            /* makes it centered */
            max-width: 1042px;
            padding: 10px;
            width: 1042px;
        }

-        /* This should also be a block element, so that it will fill 100% of the .container */
        .content {
            box-sizing: border-box;
            display: block;
@@ -83,6 +87,14 @@
        /* -------------------------------------
            HEADER, FOOTER, MAIN
        ------------------------------------- */
+        .local-preview-note {
+            text-align: center;
+            padding-top: 10px;
+        }
+        .local-preview-note p {
+            color: #282A2D;
+            font-size: 12px;
+        }
        .main {
            background: #282A2D;
            border-radius: 3px;
@@ -157,88 +169,9 @@
            text-decoration: underline;
        }

-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-        .btn {
-            box-sizing: border-box;
-            width: 100%;
-        }
-
-        .btn > tbody > tr > td {
-            padding-bottom: 15px;
-        }
-
-        .btn table {
-            width: auto;
-        }
-
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 5px;
-            text-align: center;
-        }
-
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #3498db;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #3498db;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 25px;
-            text-decoration: none;
-            text-transform: capitalize;
-        }
-
-        .btn-primary table td {
-            background-color: #3498db;
-        }
-
-        .btn-primary a {
-            background-color: #3498db;
-            border-color: #3498db;
-            color: #ffffff;
-        }
-
        /* -------------------------------------
            OTHER STYLES THAT MIGHT BE USEFUL
        ------------------------------------- */
-        .last {
-            margin-bottom: 0;
-        }
-
-        .first {
-            margin-top: 0;
-        }
-
-        .align-center {
-            text-align: center;
-        }
-
-        .align-right {
-            text-align: right;
-        }
-
-        .align-left {
-            text-align: left;
-        }
-
-        .clear {
-            clear: both;
-        }
-
-        .mt0 {
-            margin-top: 0;
-        }
-
-        .mb0 {
-            margin-bottom: 0;
-        }
        .mb5 {
            margin-bottom: 5px;
        }
@@ -248,9 +181,6 @@
            text-overflow: ellipsis;
            overflow: hidden;
        }
-        .clear {
-            clear: both;
-        }

        .preheader {
            color: transparent;
@@ -309,6 +239,7 @@
            margin-left: auto;
            margin-right: auto;
        }
+
        /* -------------------------------------
            MEDIA SECTIONS
        ------------------------------------- */
@@ -363,6 +294,7 @@
            font-size: 20px;
            text-transform: uppercase;
        }
+
        /* -------------------------------------
            MEDIA CARDS
        ------------------------------------- */
@@ -465,21 +397,21 @@
            padding-left: 5px;
        }
        .card-info-footer .badge-container {
-            max-width: 265px;
+            max-width: 260px;
            white-space: nowrap;
            overflow: hidden;
            text-overflow: ellipsis;
        }
        .card-info-footer .star-rating-container {
-            width: 60px;
-            vertical-align: bottom;
-            padding-right: 5px;
+            width: 65px;
        }
        .card-info-footer .star-rating {
+            margin-left: 4px;
            font-size: 0.8rem;
            line-height: 1rem;
            width: 0.5rem;
            display: inline-block;
+            vertical-align: bottom;
        }
        .star-rating.full {
            color: #E5A00D;
@@ -490,6 +422,7 @@
        .badge {
            display: inline-block;
            min-width: 10px;
+            margin-right: 4px;
            padding: 3px 7px;
            font-size: 11px;
            line-height: 1;
@@ -594,37 +527,27 @@
                line-height: inherit !important;
                text-decoration: none !important;
            }
-
-            .btn-primary table td:hover {
-                background-color: #34495e !important;
-            }
-
-            .btn-primary a:hover {
-                background-color: #34495e !important;
-                border-color: #34495e !important;
-            }
        }

    </style>
 </head>
-<body class="" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;-webkit-font-smoothing: antialiased;font-size: 14px;line-height: 1.4;margin: 0;padding: 0;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
+<body style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;-webkit-font-smoothing: antialiased;font-size: 14px;line-height: 1.4;margin: 0;padding: 0;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
+% if preview and service and service != 'self-hosted':
+<div class="local-preview-note" style="text-align: center;padding-top: 10px;"><p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;color: #282A2D;font-size: 12px;">Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.</p></div>  <!-- IGNORE SAVE -->
+% elif preview and not service:
+<div class="local-preview-note" style="text-align: center;padding-top: 10px;"><p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;color: #282A2D;font-size: 12px;">Warning: The Image Hosting setting must be enabled for images to display on the newsletter.</p></div>  <!-- IGNORE SAVE -->
+% endif
 <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
    <tr>
        <td class="container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;display: block;max-width: 1042px;padding: 10px;width: 1042px;margin: 0 auto !important;">
            <div class="content" style="box-sizing: border-box;display: block;margin: 0 auto;max-width: 1037px;padding: 10px;">
-
-                <!-- START CENTERED WHITE CONTAINER -->
                <span class="preheader" style="color: transparent;display: none;height: 0;max-height: 0;max-width: 0;opacity: 0;overflow: hidden;mso-hide: all;visibility: hidden;width: 0;">Tautulli Newsletter  - ${subject}</span>
-
                % if base_url and not preview:
                <div class="view-full" style="clear: both;color: #282A2D;font-size: 12px;margin-bottom: 10px;text-align: center;width: 100%;">  <!-- IGNORE SAVE -->
                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank" style="text-decoration: underline;color: #282A2D;">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
                </div>  <!-- IGNORE SAVE -->
                % endif
-
                <table border="0" cellpadding="3" cellspacing="0" class="main" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background: #282A2D;border-radius: 3px;color: #ffffff;">
-
-                    <!-- START MAIN CONTENT AREA -->
                    <tr>
                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
                            <div class="header" style="width: 100%;height: 90px;text-align: center;">
@@ -634,7 +557,6 @@
                            <div class="dates" style="color: #aaaaaa;font-size: 20px;text-align: center;">${parameters['start_date']} - ${parameters['end_date']}</div>
                        </td>
                    </tr>
-
                    % if message:
                    <tr>
                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
@@ -643,7 +565,6 @@
                        </td>
                    </tr>
                    % endif
-
                    % if recently_added.get('movie'):
                    <tr>
                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
@@ -659,109 +580,105 @@
                    <tr>
                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                <tbody>
-                                    % for movie_a, movie_b in grouper(recently_added['movie'], 2):
-                                    <tr>
-                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                            <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                <tbody>
-                                                    <tr>
-                                                        % for movie in (movie_a, movie_b):
-                                                        % if movie:
-                                                        % if not movie_b:
-                                                        <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                        % endif
-                                                        <td align="center" valign="top" class="card-instance movie" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
-                                                            <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + movie['art_hash']) if base_url_image else movie['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                <tbody>
+                                % for movie_a, movie_b in grouper(recently_added['movie'], 2):
+                                <tr>
+                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                            <tr>
+                                                % for movie in (movie_a, movie_b):
+                                                % if movie:
+                                                % if not movie_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                <td align="center" valign="top" class="card-instance movie" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + movie['art_hash']) if base_url_image else movie['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
+                                                        <tr>
+                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['poster_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                    <tr>
-                                                                        <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['poster_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" style="text-decoration: underline;">
-                                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                                            </a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
-                                                                            </table>
+                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" style="text-decoration: underline;">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
+                                                                            </a>
                                                                        </td>
-                                                                        <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${movie['title']}</a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
-                                                                                            % if movie['tagline']:
-                                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                                <em>${movie['tagline']}</em>
-                                                                                            </p>
-                                                                                            % endif
-                                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                                ${movie['summary'][:450] + (movie['summary'][450:] and '...')}
-                                                                                            </p>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                                <tbody>
-                                                                                                    <tr>
-                                                                                                        <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 265px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                                            % if movie['year']:
-                                                                                                            <span class="badge" title="${movie['year']}" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${movie['year']}</span>
-                                                                                                            % endif
-                                                                                                            % if movie['duration']:
-                                                                                                            <% duration = int(int(movie['duration'])/60000) %>
-                                                                                                            <span class="badge" title="${duration} mins" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</span>
-                                                                                                            % endif
-                                                                                                            % if movie['genres']:
-                                                                                                            % for genre in movie['genres'][:2]:
-                                                                                                            <span class="badge" title="${genre}" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</span>
-                                                                                                            % endfor
-                                                                                                            % endif
-                                                                                                        </td>
-                                                                                                        % if movie['rating']:
-                                                                                                        <% rating = int(round(float(movie['rating']) / 2)) %>
-                                                                                                        <td class="star-rating-container" title="${int(float(movie['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: bottom;width: 60px;padding-right: 5px;">
-                                                                                                            % for _ in range(rating):
-                                                                                                            <span class="star-rating full" style="font-size: 0.8rem;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</span>
-                                                                                                            % endfor
-                                                                                                            % for _ in range(5-rating):
-                                                                                                            <span class="star-rating empty" style="font-size: 0.8rem;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</span>
-                                                                                                            % endfor
-                                                                                                        </td>
-                                                                                                        % endif
-                                                                                                    </tr>
-                                                                                                </tbody>
-                                                                                            </table>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${movie['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
+                                                                            % if movie['tagline']:
+                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
+                                                                                <em>${movie['tagline']}</em>
+                                                                            </p>
+                                                                            % endif
+                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
+                                                                                ${movie['summary'][:450] + (movie['summary'][450:] and '...')}
+                                                                            </p>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
+                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                <tr>
+                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % if movie['year']:
+                                                                                                <td class="badge" title="${movie['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${movie['year']}</td>
+                                                                                                % endif
+                                                                                                % if movie['duration']:
+                                                                                                <% duration = int(int(movie['duration'])/60000) %>
+                                                                                                <td class="badge" title="${duration} mins" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</td>
+                                                                                                % endif
+                                                                                                % if movie['genres']:
+                                                                                                % for genre in movie['genres'][:]:
+                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
+                                                                                                % endfor
+                                                                                                % endif
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if movie['rating']:
+                                                                                    <% rating = int(round(float(movie['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(movie['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
                                                                            </table>
                                                                        </td>
                                                                    </tr>
-                                                                </tbody>
-                                                            </table>
-                                                        </td>
-                                                        % if not movie_b:
-                                                        <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                        % endif
-                                                        % endif
-                                                        % endfor
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    % endfor
-                                </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not movie_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
                            </table>
                        </td>
                    </tr>
@@ -783,142 +700,137 @@
                    <tr>
                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                <tbody>
-                                    % for show_a, show_b in grouper(recently_added['show'], 2):
-                                    <tr>
-                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                            <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                <tbody>
-                                                    <tr>
-                                                        % for show in (show_a, show_b):
-                                                        % if show:
-                                                        % if not show_b:
-                                                        <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                        % endif
-                                                        <%
-                                                            if show['season_count'] == 1:
-                                                                if show['season'][0]['episode_count'] == 1:
-                                                                    link_rating_key = show['season'][0]['episode'][0]['rating_key']
-                                                                else:
-                                                                    link_rating_key = show['season'][0]['episode'][0]['parent_rating_key']
-                                                            else:
-                                                                link_rating_key = show['rating_key']
-                                                        %>
-                                                        <td align="center" valign="top" class="card-instance show" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
-                                                            <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + show['art_hash']) if base_url_image else show['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                <tbody>
+                                % for show_a, show_b in grouper(recently_added['show'], 2):
+                                <tr>
+                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                            <tr>
+                                                % for show in (show_a, show_b):
+                                                % if show:
+                                                % if not show_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                <%
+                                                    if show['season_count'] == 1:
+                                                        if show['season'][0]['episode_count'] == 1:
+                                                            link_rating_key = show['season'][0]['episode'][0]['rating_key']
+                                                        else:
+                                                            link_rating_key = show['season'][0]['episode'][0]['parent_rating_key']
+                                                    else:
+                                                        link_rating_key = show['rating_key']
+                                                %>
+                                                <td align="center" valign="top" class="card-instance show" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + show['art_hash']) if base_url_image else show['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
+                                                        <tr>
+                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['poster_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                    <tr>
-                                                                        <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['poster_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" style="text-decoration: underline;">
-                                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                                            </a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
-                                                                            </table>
+                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" style="text-decoration: underline;">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
+                                                                            </a>
                                                                        </td>
-                                                                        <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${show['title']}</a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
-                                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                                % if show['season_count'] > 1:
-                                                                                                    <em>${show['season_count']} seasons /</em>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${show['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
+                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
+                                                                                % if show['season_count'] > 1:
+                                                                                    <em>${show['season_count']} seasons /</em>
+                                                                                % endif
+                                                                                <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %>
+                                                                                <em>${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}</em>
+                                                                            </p>
+                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
+                                                                                % for i, season in enumerate(show['season'][:8]):
+                                                                                    % if season['episode_count'] == 1:
+                                                                                        Season ${season['media_index']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
+                                                                                    % else:
+                                                                                        Season ${season['media_index']} &middot; Episodes ${season['episode_range']}
+                                                                                    % endif
+                                                                                    % if i < min(show['season_count'], 7):
+                                                                                        <br>
+                                                                                    % elif i == 7 and show['season_count'] > 8:
+                                                                                        ...plus ${show['season_count'] - 8} more seasons!
+                                                                                    % endif
+                                                                                % endfor
+                                                                            </p>
+                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
+                                                                                % if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1:
+                                                                                ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')}
+                                                                                % else:
+                                                                                <% length = max(0, 350 - 50 * (show['season_count'] - 1)) %>
+                                                                                    % if length:
+                                                                                    ${show['summary'][:length] + (show['summary'][length:] and '...')}
+                                                                                    % endif
+                                                                                % endif
+                                                                            </p>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
+                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                <tr>
+                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % if show['year']:
+                                                                                                <td class="badge" title="${show['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${show['year']}</td>
                                                                                                % endif
-                                                                                                <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %>
-                                                                                                <em>${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}</em>
-                                                                                            </p>
-                                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                                % for i, season in enumerate(show['season'][:8]):
-                                                                                                    Season ${season['media_index']} &middot;
-                                                                                                    % if season['episode_count'] == 1:
-                                                                                                        Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
-                                                                                                    % else:
-                                                                                                        Episodes ${season['episode_range']}
-                                                                                                    % endif
-                                                                                                    % if i < min(show['season_count'], 7):
-                                                                                                        <br>
-                                                                                                    % elif i == 7 and show['season_count'] > 8:
-                                                                                                        ...plus ${show['season_count'] - 8} more seasons!
-                                                                                                    % endif
+                                                                                                % if show['duration']:
+                                                                                                <% duration = int(int(show['duration'])/60000) %>
+                                                                                                <td class="badge" title="${duration} mins" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</td>
+                                                                                                % endif
+                                                                                                % if show['genres']:
+                                                                                                % for genre in show['genres'][:2]:
+                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
                                                                                                % endfor
-                                                                                            </p>
-                                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                                % if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1:
-                                                                                                ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')}
-                                                                                                % else:
-                                                                                                <% length = max(0, 350 - 50 * (show['season_count'] - 1)) %>
-                                                                                                    % if length:
-                                                                                                    ${show['summary'][:length] + (show['summary'][length:] and '...')}
-                                                                                                    % endif
                                                                                                % endif
-                                                                                            </p>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                                <tbody>
-                                                                                                    <tr>
-                                                                                                        <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 265px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                                            % if show['year']:
-                                                                                                            <span class="badge" title="${show['year']}" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${show['year']}</span>
-                                                                                                            % endif
-                                                                                                            % if show['duration']:
-                                                                                                            <% duration = int(int(show['duration'])/60000) %>
-                                                                                                            <span class="badge" title="${duration} mins" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</span>
-                                                                                                            % endif
-                                                                                                            % if show['genres']:
-                                                                                                            % for genre in show['genres'][:2]:
-                                                                                                            <span class="badge" title="${genre}" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</span>
-                                                                                                            % endfor
-                                                                                                            % endif
-                                                                                                        </td>
-                                                                                                        % if show['rating']:
-                                                                                                        <% rating = int(round(float(show['rating']) / 2)) %>
-                                                                                                        <td class="star-rating-container" title="${int(float(show['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: bottom;width: 60px;padding-right: 5px;">
-                                                                                                            % for _ in range(rating):
-                                                                                                            <span class="star-rating full" style="font-size: 0.8rem;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</span>
-                                                                                                            % endfor
-                                                                                                            % for _ in range(5-rating):
-                                                                                                            <span class="star-rating empty" style="font-size: 0.8rem;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</span>
-                                                                                                            % endfor
-                                                                                                        </td>
-                                                                                                        % endif
-                                                                                                    </tr>
-                                                                                                </tbody>
-                                                                                            </table>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if show['rating']:
+                                                                                    <% rating = int(round(float(show['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(show['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
                                                                            </table>
                                                                        </td>
                                                                    </tr>
-                                                                </tbody>
-                                                            </table>
-                                                        </td>
-                                                        % if not show_b:
-                                                        <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                        % endif
-                                                        % endif
-                                                        % endfor
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    % endfor
-                                </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not show_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
                            </table>
                        </td>
                    </tr>
@@ -940,124 +852,114 @@
                    <tr>
                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                <tbody>
-                                    % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2):
-                                    <tr>
-                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                            <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                <tbody>
-                                                    <tr>
-                                                        % for album in (album_a, album_b):
-                                                        % if album:
-                                                        % if not album_b:
-                                                        <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                        % endif
-                                                        <td align="center" valign="top" class="card-instance album" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 158px;">
-                                                            <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + album['art_hash']) if base_url_image else album['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                <tbody>
+                                % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2):
+                                <tr>
+                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                            <tr>
+                                                % for album in (album_a, album_b):
+                                                % if album:
+                                                % if not album_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                <td align="center" valign="top" class="card-instance album" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 158px;">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + album['art_hash']) if base_url_image else album['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
+                                                        <tr>
+                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 152px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['poster_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                    <tr>
-                                                                        <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 152px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['poster_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" style="text-decoration: underline;">
-                                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                                            </a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
-                                                                            </table>
+                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" style="text-decoration: underline;">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
+                                                                            </a>
                                                                        </td>
-                                                                        <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 152px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${album['title']}</a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 82px;min-height: 82px;">
-                                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                                <em>${album['parent_title']} &middot; ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}</em>
-                                                                                            </p>
-                                                                                            % if artist['title'].lower() != 'various artists':
-                                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                                ${album['summary'][:200] + (album['summary'][200:] and '...')}
-                                                                                            </p>
-                                                                                            % endif
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                                <tbody>
-                                                                                                    <tr>
-                                                                                                        <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 265px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                                            % if album['year']:
-                                                                                                            <span class="badge" title="${album['year']}" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${album['year']}</span>
-                                                                                                            % endif
-                                                                                                            % if album['genres']:
-                                                                                                            % for genre in album['genres'][:2]:
-                                                                                                            <span class="badge" title="${genre}" style="display: inline-block;min-width: 10px;padding: 3px 7px;font-size: 11px;line-height: 1;text-align: center;white-space: nowrap;vertical-align: middle;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</span>
-                                                                                                            % endfor
-                                                                                                            % endif
-                                                                                                        </td>
-                                                                                                        % if album['rating']:
-                                                                                                        <% rating = int(round(float(album['rating']) / 2)) %>
-                                                                                                        <td class="star-rating-container" title="${int(float(album['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: bottom;width: 60px;padding-right: 5px;">
-                                                                                                            % for _ in range(rating):
-                                                                                                            <span class="star-rating full" style="font-size: 0.8rem;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</span>
-                                                                                                            % endfor
-                                                                                                            % for _ in range(5-rating):
-                                                                                                            <span class="star-rating empty" style="font-size: 0.8rem;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</span>
-                                                                                                            % endfor
-                                                                                                        </td>
-                                                                                                        % endif
-                                                                                                    </tr>
-                                                                                                </tbody>
-                                                                                            </table>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 152px;">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${album['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 82px;min-height: 82px;">
+                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
+                                                                                <em>${album['parent_title']} &middot; ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}</em>
+                                                                            </p>
+                                                                            % if artist['title'].lower() != 'various artists':
+                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
+                                                                                ${album['summary'][:200] + (album['summary'][200:] and '...')}
+                                                                            </p>
+                                                                            % endif
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
+                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                <tr>
+                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % if album['year']:
+                                                                                                <td class="badge" title="${album['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${album['year']}</td>
+                                                                                                % endif
+                                                                                                % if album['genres']:
+                                                                                                % for genre in album['genres'][:2]:
+                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
+                                                                                                % endfor
+                                                                                                % endif
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if album['rating']:
+                                                                                    <% rating = int(round(float(album['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(album['rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
                                                                            </table>
                                                                        </td>
                                                                    </tr>
-                                                                </tbody>
-                                                            </table>
-                                                        </td>
-                                                        % if not album_b:
-                                                        <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                        % endif
-                                                        % endif
-                                                        % endfor
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    % endfor
-                                </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not album_b:
+                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
                            </table>
                        </td>
                    </tr>
                    % endif
                    <tr>
                        <td class="footer" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;clear: both;margin-top: 10px;text-align: center;width: 100%;">
-                            <!-- START FOOTER -->
                            <div class="footer-bar" style="margin-left: auto;margin-right: auto;width: 200px;border-top: 1px solid #E5A00D;margin-top: 25px;"></div>
                            <div class="content-block powered-by" style="padding-bottom: 10px;padding-top: 10px;">
                                Newsletter generated by <a href="http://tautulli.com" target="_blank" style="text-decoration: underline;color: #fff;font-size: 12px;text-align: center;">Tautulli</a>.
                            </div>
-                            <!-- END FOOTER -->
                        </td>
                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
                </table>
-
-                <!-- END CENTERED WHITE CONTAINER -->
            </div>
        </td>
    </tr>
--- a/data/interfaces/newsletters/recently_added.internal.html
+++ b/data/interfaces/newsletters/recently_added.internal.html
@@ -1,17 +1,24 @@
 % if data:
 <%
    import plexpy
-    from plexpy.helpers import grouper
+    from plexpy.helpers import grouper, get_img_service

    recently_added = data['recently_added']
    if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
        base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
-        base_url_image = base_url + 'image/'
    elif preview:
        base_url = 'newsletter/'
-        base_url_image = base_url + 'image/'
    else:
-        base_url = base_url_image = ''
+        base_url = ''
+
+    service = get_img_service(include_self=True)
+    if service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
+        base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'image/'
+    elif preview and service and service != 'self-hosted':
+        base_url_image = 'image/'
+    else:
+        base_url_image = ''
+
 %>
 <!doctype html>
 <html>
@@ -61,17 +68,14 @@
            width: 100%;
        }

-        /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
        .container {
            display: block;
            margin: 0 auto !important;
-            /* makes it centered */
            max-width: 1042px;
            padding: 10px;
            width: 1042px;
        }

-        /* This should also be a block element, so that it will fill 100% of the .container */
        .content {
            box-sizing: border-box;
            display: block;
@@ -83,6 +87,14 @@
        /* -------------------------------------
            HEADER, FOOTER, MAIN
        ------------------------------------- */
+        .local-preview-note {
+            text-align: center;
+            padding-top: 10px;
+        }
+        .local-preview-note p {
+            color: #282A2D;
+            font-size: 12px;
+        }
        .main {
            background: #282A2D;
            border-radius: 3px;
@@ -157,88 +169,9 @@
            text-decoration: underline;
        }

-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-        .btn {
-            box-sizing: border-box;
-            width: 100%;
-        }
-
-        .btn > tbody > tr > td {
-            padding-bottom: 15px;
-        }
-
-        .btn table {
-            width: auto;
-        }
-
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 5px;
-            text-align: center;
-        }
-
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #3498db;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #3498db;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 25px;
-            text-decoration: none;
-            text-transform: capitalize;
-        }
-
-        .btn-primary table td {
-            background-color: #3498db;
-        }
-
-        .btn-primary a {
-            background-color: #3498db;
-            border-color: #3498db;
-            color: #ffffff;
-        }
-
        /* -------------------------------------
            OTHER STYLES THAT MIGHT BE USEFUL
        ------------------------------------- */
-        .last {
-            margin-bottom: 0;
-        }
-
-        .first {
-            margin-top: 0;
-        }
-
-        .align-center {
-            text-align: center;
-        }
-
-        .align-right {
-            text-align: right;
-        }
-
-        .align-left {
-            text-align: left;
-        }
-
-        .clear {
-            clear: both;
-        }
-
-        .mt0 {
-            margin-top: 0;
-        }
-
-        .mb0 {
-            margin-bottom: 0;
-        }
        .mb5 {
            margin-bottom: 5px;
        }
@@ -248,9 +181,6 @@
            text-overflow: ellipsis;
            overflow: hidden;
        }
-        .clear {
-            clear: both;
-        }

        .preheader {
            color: transparent;
@@ -309,6 +239,7 @@
            margin-left: auto;
            margin-right: auto;
        }
+
        /* -------------------------------------
            MEDIA SECTIONS
        ------------------------------------- */
@@ -363,6 +294,7 @@
            font-size: 20px;
            text-transform: uppercase;
        }
+
        /* -------------------------------------
            MEDIA CARDS
        ------------------------------------- */
@@ -436,6 +368,7 @@
            line-height: 1.2rem;
            font-size: 0.9rem;
            padding: 5px;
+            max-width: 320px;
        }
        .card-info-title a {
            text-decoration: none;
@@ -465,21 +398,21 @@
            padding-left: 5px;
        }
        .card-info-footer .badge-container {
-            max-width: 265px;
+            max-width: 260px;
            white-space: nowrap;
            overflow: hidden;
            text-overflow: ellipsis;
        }
        .card-info-footer .star-rating-container {
-            width: 60px;
-            vertical-align: bottom;
-            padding-right: 5px;
+            width: 65px;
        }
        .card-info-footer .star-rating {
+            margin-left: 4px;
            font-size: 0.8rem;
            line-height: 1rem;
            width: 0.5rem;
            display: inline-block;
+            vertical-align: bottom;
        }
        .star-rating.full {
            color: #E5A00D;
@@ -490,6 +423,7 @@
        .badge {
            display: inline-block;
            min-width: 10px;
+            margin-right: 4px;
            padding: 3px 7px;
            font-size: 11px;
            line-height: 1;
@@ -594,37 +528,27 @@
                line-height: inherit !important;
                text-decoration: none !important;
            }
-
-            .btn-primary table td:hover {
-                background-color: #34495e !important;
-            }
-
-            .btn-primary a:hover {
-                background-color: #34495e !important;
-                border-color: #34495e !important;
-            }
        }

    </style>
 </head>
-<body class="">
+<body>
+% if preview and service and service != 'self-hosted':
+<div class="local-preview-note"><p>Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.</p></div>  <!-- IGNORE SAVE -->
+% elif preview and not service:
+<div class="local-preview-note"><p>Warning: The Image Hosting setting must be enabled for images to display on the newsletter.</p></div>  <!-- IGNORE SAVE -->
+% endif
 <table border="0" cellpadding="0" cellspacing="0" class="body">
    <tr>
        <td class="container">
            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
                <span class="preheader">Tautulli Newsletter  - ${subject}</span>
-
                % if base_url and not preview:
                <div class="view-full">  <!-- IGNORE SAVE -->
                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
                </div>  <!-- IGNORE SAVE -->
                % endif
-
                <table border="0" cellpadding="3" cellspacing="0" class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
                    <tr>
                        <td class="wrapper">
                            <div class="header">
@@ -634,7 +558,6 @@
                            <div class="dates">${parameters['start_date']} - ${parameters['end_date']}</div>
                        </td>
                    </tr>
-
                    % if message:
                    <tr>
                        <td class="wrapper">
@@ -643,7 +566,6 @@
                        </td>
                    </tr>
                    % endif
-
                    % if recently_added.get('movie'):
                    <tr>
                        <td class="wrapper">
@@ -659,109 +581,105 @@
                    <tr>
                        <td>
                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tbody>
-                                    % for movie_a, movie_b in grouper(recently_added['movie'], 2):
-                                    <tr>
-                                        <td>
-                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                                <tbody>
-                                                    <tr>
-                                                        % for movie in (movie_a, movie_b):
-                                                        % if movie:
-                                                        % if not movie_b:
-                                                        <td align="center" valign="top" class="card-instance pad"></td>
-                                                        % endif
-                                                        <td align="center" valign="top" class="card-instance movie">
-                                                            <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + movie['art_hash']) if base_url_image else movie['art_url']});">
-                                                                <tbody>
+                                % for movie_a, movie_b in grouper(recently_added['movie'], 2):
+                                <tr>
+                                    <td>
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                            <tr>
+                                                % for movie in (movie_a, movie_b):
+                                                % if movie:
+                                                % if not movie_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                <td align="center" valign="top" class="card-instance movie">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + movie['art_hash']) if base_url_image else movie['art_url']});">
+                                                        <tr>
+                                                            <td class="card-poster-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['poster_url']})">
                                                                    <tr>
-                                                                        <td class="card-poster-container">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['poster_url']})">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td>
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank">
-                                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
-                                                                                            </a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
-                                                                            </table>
+                                                                        <td>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
+                                                                            </a>
                                                                        </td>
-                                                                        <td class="card-info-container">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td class="card-info-title nowrap">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank">${movie['title']}</a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-body">
-                                                                                            % if movie['tagline']:
-                                                                                            <p class="nowrap mb5">
-                                                                                                <em>${movie['tagline']}</em>
-                                                                                            </p>
-                                                                                            % endif
-                                                                                            <p>
-                                                                                                ${movie['summary'][:450] + (movie['summary'][450:] and '...')}
-                                                                                            </p>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-footer nowrap">
-                                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                                <tbody>
-                                                                                                    <tr>
-                                                                                                        <td class="badge-container">
-                                                                                                            % if movie['year']:
-                                                                                                            <span class="badge" title="${movie['year']}">${movie['year']}</span>
-                                                                                                            % endif
-                                                                                                            % if movie['duration']:
-                                                                                                            <% duration = int(int(movie['duration'])/60000) %>
-                                                                                                            <span class="badge" title="${duration} mins">${duration} mins</span>
-                                                                                                            % endif
-                                                                                                            % if movie['genres']:
-                                                                                                            % for genre in movie['genres'][:2]:
-                                                                                                            <span class="badge" title="${genre}">${genre}</span>
-                                                                                                            % endfor
-                                                                                                            % endif
-                                                                                                        </td>
-                                                                                                        % if movie['rating']:
-                                                                                                        <% rating = int(round(float(movie['rating']) / 2)) %>
-                                                                                                        <td class="star-rating-container" title="${int(float(movie['rating'])/0.1)}%" align="right">
-                                                                                                            % for _ in range(rating):
-                                                                                                            <span class="star-rating full">&#9733;</span>
-                                                                                                            % endfor
-                                                                                                            % for _ in range(5-rating):
-                                                                                                            <span class="star-rating empty">&#9734;</span>
-                                                                                                            % endfor
-                                                                                                        </td>
-                                                                                                        % endif
-                                                                                                    </tr>
-                                                                                                </tbody>
-                                                                                            </table>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank">${movie['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body">
+                                                                            % if movie['tagline']:
+                                                                            <p class="nowrap mb5">
+                                                                                <em>${movie['tagline']}</em>
+                                                                            </p>
+                                                                            % endif
+                                                                            <p>
+                                                                                ${movie['summary'][:450] + (movie['summary'][450:] and '...')}
+                                                                            </p>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap">
+                                                                            <table border="0" cellpadding="0" cellspacing="0">
+                                                                                <tr>
+                                                                                    <td class="badge-container">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % if movie['year']:
+                                                                                                <td class="badge" title="${movie['year']}">${movie['year']}</td>
+                                                                                                % endif
+                                                                                                % if movie['duration']:
+                                                                                                <% duration = int(int(movie['duration'])/60000) %>
+                                                                                                <td class="badge" title="${duration} mins">${duration} mins</td>
+                                                                                                % endif
+                                                                                                % if movie['genres']:
+                                                                                                % for genre in movie['genres'][:]:
+                                                                                                <td class="badge" title="${genre}">${genre}</td>
+                                                                                                % endfor
+                                                                                                % endif
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if movie['rating']:
+                                                                                    <% rating = int(round(float(movie['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(movie['rating'])/0.1)}%" align="right">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
                                                                            </table>
                                                                        </td>
                                                                    </tr>
-                                                                </tbody>
-                                                            </table>
-                                                        </td>
-                                                        % if not movie_b:
-                                                        <td align="center" valign="top" class="card-instance pad"></td>
-                                                        % endif
-                                                        % endif
-                                                        % endfor
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    % endfor
-                                </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not movie_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
                            </table>
                        </td>
                    </tr>
@@ -783,142 +701,137 @@
                    <tr>
                        <td>
                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tbody>
-                                    % for show_a, show_b in grouper(recently_added['show'], 2):
-                                    <tr>
-                                        <td>
-                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                                <tbody>
-                                                    <tr>
-                                                        % for show in (show_a, show_b):
-                                                        % if show:
-                                                        % if not show_b:
-                                                        <td align="center" valign="top" class="card-instance pad"></td>
-                                                        % endif
-                                                        <%
-                                                            if show['season_count'] == 1:
-                                                                if show['season'][0]['episode_count'] == 1:
-                                                                    link_rating_key = show['season'][0]['episode'][0]['rating_key']
-                                                                else:
-                                                                    link_rating_key = show['season'][0]['episode'][0]['parent_rating_key']
-                                                            else:
-                                                                link_rating_key = show['rating_key']
-                                                        %>
-                                                        <td align="center" valign="top" class="card-instance show">
-                                                            <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + show['art_hash']) if base_url_image else show['art_url']});">
-                                                                <tbody>
+                                % for show_a, show_b in grouper(recently_added['show'], 2):
+                                <tr>
+                                    <td>
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                            <tr>
+                                                % for show in (show_a, show_b):
+                                                % if show:
+                                                % if not show_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                <%
+                                                    if show['season_count'] == 1:
+                                                        if show['season'][0]['episode_count'] == 1:
+                                                            link_rating_key = show['season'][0]['episode'][0]['rating_key']
+                                                        else:
+                                                            link_rating_key = show['season'][0]['episode'][0]['parent_rating_key']
+                                                    else:
+                                                        link_rating_key = show['rating_key']
+                                                %>
+                                                <td align="center" valign="top" class="card-instance show">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + show['art_hash']) if base_url_image else show['art_url']});">
+                                                        <tr>
+                                                            <td class="card-poster-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['poster_url']})">
                                                                    <tr>
-                                                                        <td class="card-poster-container">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['poster_url']})">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td>
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank">
-                                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
-                                                                                            </a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
-                                                                            </table>
+                                                                        <td>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
+                                                                            </a>
                                                                        </td>
-                                                                        <td class="card-info-container">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td class="card-info-title nowrap">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank">${show['title']}</a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-body">
-                                                                                            <p class="nowrap mb5">
-                                                                                                % if show['season_count'] > 1:
-                                                                                                    <em>${show['season_count']} seasons /</em>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank">${show['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body">
+                                                                            <p class="nowrap mb5">
+                                                                                % if show['season_count'] > 1:
+                                                                                    <em>${show['season_count']} seasons /</em>
+                                                                                % endif
+                                                                                <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %>
+                                                                                <em>${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}</em>
+                                                                            </p>
+                                                                            <p class="nowrap mb5">
+                                                                                % for i, season in enumerate(show['season'][:8]):
+                                                                                    % if season['episode_count'] == 1:
+                                                                                        Season ${season['media_index']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
+                                                                                    % else:
+                                                                                        Season ${season['media_index']} &middot; Episodes ${season['episode_range']}
+                                                                                    % endif
+                                                                                    % if i < min(show['season_count'], 7):
+                                                                                        <br>
+                                                                                    % elif i == 7 and show['season_count'] > 8:
+                                                                                        ...plus ${show['season_count'] - 8} more seasons!
+                                                                                    % endif
+                                                                                % endfor
+                                                                            </p>
+                                                                            <p>
+                                                                                % if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1:
+                                                                                ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')}
+                                                                                % else:
+                                                                                <% length = max(0, 350 - 50 * (show['season_count'] - 1)) %>
+                                                                                    % if length:
+                                                                                    ${show['summary'][:length] + (show['summary'][length:] and '...')}
+                                                                                    % endif
+                                                                                % endif
+                                                                            </p>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap">
+                                                                            <table border="0" cellpadding="0" cellspacing="0">
+                                                                                <tr>
+                                                                                    <td class="badge-container">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % if show['year']:
+                                                                                                <td class="badge" title="${show['year']}">${show['year']}</td>
                                                                                                % endif
-                                                                                                <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %>
-                                                                                                <em>${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}</em>
-                                                                                            </p>
-                                                                                            <p class="nowrap mb5">
-                                                                                                % for i, season in enumerate(show['season'][:8]):
-                                                                                                    Season ${season['media_index']} &middot;
-                                                                                                    % if season['episode_count'] == 1:
-                                                                                                        Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
-                                                                                                    % else:
-                                                                                                        Episodes ${season['episode_range']}
-                                                                                                    % endif
-                                                                                                    % if i < min(show['season_count'], 7):
-                                                                                                        <br>
-                                                                                                    % elif i == 7 and show['season_count'] > 8:
-                                                                                                        ...plus ${show['season_count'] - 8} more seasons!
-                                                                                                    % endif
+                                                                                                % if show['duration']:
+                                                                                                <% duration = int(int(show['duration'])/60000) %>
+                                                                                                <td class="badge" title="${duration} mins">${duration} mins</td>
+                                                                                                % endif
+                                                                                                % if show['genres']:
+                                                                                                % for genre in show['genres'][:2]:
+                                                                                                <td class="badge" title="${genre}">${genre}</td>
                                                                                                % endfor
-                                                                                            </p>
-                                                                                            <p>
-                                                                                                % if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1:
-                                                                                                ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')}
-                                                                                                % else:
-                                                                                                <% length = max(0, 350 - 50 * (show['season_count'] - 1)) %>
-                                                                                                    % if length:
-                                                                                                    ${show['summary'][:length] + (show['summary'][length:] and '...')}
-                                                                                                    % endif
                                                                                                % endif
-                                                                                            </p>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-footer nowrap">
-                                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                                <tbody>
-                                                                                                    <tr>
-                                                                                                        <td class="badge-container">
-                                                                                                            % if show['year']:
-                                                                                                            <span class="badge" title="${show['year']}">${show['year']}</span>
-                                                                                                            % endif
-                                                                                                            % if show['duration']:
-                                                                                                            <% duration = int(int(show['duration'])/60000) %>
-                                                                                                            <span class="badge" title="${duration} mins">${duration} mins</span>
-                                                                                                            % endif
-                                                                                                            % if show['genres']:
-                                                                                                            % for genre in show['genres'][:2]:
-                                                                                                            <span class="badge" title="${genre}">${genre}</span>
-                                                                                                            % endfor
-                                                                                                            % endif
-                                                                                                        </td>
-                                                                                                        % if show['rating']:
-                                                                                                        <% rating = int(round(float(show['rating']) / 2)) %>
-                                                                                                        <td class="star-rating-container" title="${int(float(show['rating'])/0.1)}%" align="right">
-                                                                                                            % for _ in range(rating):
-                                                                                                            <span class="star-rating full">&#9733;</span>
-                                                                                                            % endfor
-                                                                                                            % for _ in range(5-rating):
-                                                                                                            <span class="star-rating empty">&#9734;</span>
-                                                                                                            % endfor
-                                                                                                        </td>
-                                                                                                        % endif
-                                                                                                    </tr>
-                                                                                                </tbody>
-                                                                                            </table>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if show['rating']:
+                                                                                    <% rating = int(round(float(show['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(show['rating'])/0.1)}%" align="right">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
                                                                            </table>
                                                                        </td>
                                                                    </tr>
-                                                                </tbody>
-                                                            </table>
-                                                        </td>
-                                                        % if not show_b:
-                                                        <td align="center" valign="top" class="card-instance pad"></td>
-                                                        % endif
-                                                        % endif
-                                                        % endfor
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    % endfor
-                                </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not show_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
                            </table>
                        </td>
                    </tr>
@@ -940,124 +853,114 @@
                    <tr>
                        <td>
                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tbody>
-                                    % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2):
-                                    <tr>
-                                        <td>
-                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                                <tbody>
-                                                    <tr>
-                                                        % for album in (album_a, album_b):
-                                                        % if album:
-                                                        % if not album_b:
-                                                        <td align="center" valign="top" class="card-instance pad"></td>
-                                                        % endif
-                                                        <td align="center" valign="top" class="card-instance album">
-                                                            <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + album['art_hash']) if base_url_image else album['art_url']});">
-                                                                <tbody>
+                                % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2):
+                                <tr>
+                                    <td>
+                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                            <tr>
+                                                % for album in (album_a, album_b):
+                                                % if album:
+                                                % if not album_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                <td align="center" valign="top" class="card-instance album">
+                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + album['art_hash']) if base_url_image else album['art_url']});">
+                                                        <tr>
+                                                            <td class="card-poster-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['poster_url']})">
                                                                    <tr>
-                                                                        <td class="card-poster-container">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['poster_url']})">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td>
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank">
-                                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150">
-                                                                                            </a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
-                                                                            </table>
+                                                                        <td>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank">
+                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'http://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150">
+                                                                            </a>
                                                                        </td>
-                                                                        <td class="card-info-container">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                                <tbody>
-                                                                                    <tr>
-                                                                                        <td class="card-info-title nowrap">
-                                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank">${album['title']}</a>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-body">
-                                                                                            <p class="nowrap mb5">
-                                                                                                <em>${album['parent_title']} &middot; ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}</em>
-                                                                                            </p>
-                                                                                            % if artist['title'].lower() != 'various artists':
-                                                                                            <p>
-                                                                                                ${album['summary'][:200] + (album['summary'][200:] and '...')}
-                                                                                            </p>
-                                                                                            % endif
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    <tr>
-                                                                                        <td class="card-info-footer nowrap">
-                                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                                <tbody>
-                                                                                                    <tr>
-                                                                                                        <td class="badge-container">
-                                                                                                            % if album['year']:
-                                                                                                            <span class="badge" title="${album['year']}">${album['year']}</span>
-                                                                                                            % endif
-                                                                                                            % if album['genres']:
-                                                                                                            % for genre in album['genres'][:2]:
-                                                                                                            <span class="badge" title="${genre}">${genre}</span>
-                                                                                                            % endfor
-                                                                                                            % endif
-                                                                                                        </td>
-                                                                                                        % if album['rating']:
-                                                                                                        <% rating = int(round(float(album['rating']) / 2)) %>
-                                                                                                        <td class="star-rating-container" title="${int(float(album['rating'])/0.1)}%" align="right">
-                                                                                                            % for _ in range(rating):
-                                                                                                            <span class="star-rating full">&#9733;</span>
-                                                                                                            % endfor
-                                                                                                            % for _ in range(5-rating):
-                                                                                                            <span class="star-rating empty">&#9734;</span>
-                                                                                                            % endfor
-                                                                                                        </td>
-                                                                                                        % endif
-                                                                                                    </tr>
-                                                                                                </tbody>
-                                                                                            </table>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                </tbody>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                            <td class="card-info-container">
+                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
+                                                                    <tr>
+                                                                        <td class="card-info-title nowrap">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank">${album['title']}</a>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-body">
+                                                                            <p class="nowrap mb5">
+                                                                                <em>${album['parent_title']} &middot; ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}</em>
+                                                                            </p>
+                                                                            % if artist['title'].lower() != 'various artists':
+                                                                            <p>
+                                                                                ${album['summary'][:200] + (album['summary'][200:] and '...')}
+                                                                            </p>
+                                                                            % endif
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr>
+                                                                        <td class="card-info-footer nowrap">
+                                                                            <table border="0" cellpadding="0" cellspacing="0">
+                                                                                <tr>
+                                                                                    <td class="badge-container">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % if album['year']:
+                                                                                                <td class="badge" title="${album['year']}">${album['year']}</td>
+                                                                                                % endif
+                                                                                                % if album['genres']:
+                                                                                                % for genre in album['genres'][:2]:
+                                                                                                <td class="badge" title="${genre}">${genre}</td>
+                                                                                                % endfor
+                                                                                                % endif
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % if album['rating']:
+                                                                                    <% rating = int(round(float(album['rating']) / 2)) %>
+                                                                                    <td class="star-rating-container" title="${int(float(album['rating'])/0.1)}%" align="right">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tr>
+                                                                                                % for _ in range(rating):
+                                                                                                <td class="star-rating full">&#9733;</td>
+                                                                                                % endfor
+                                                                                                % for _ in range(5-rating):
+                                                                                                <td class="star-rating empty">&#9734;</td>
+                                                                                                % endfor
+                                                                                            </tr>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                    % endif
+                                                                                </tr>
                                                                            </table>
                                                                        </td>
                                                                    </tr>
-                                                                </tbody>
-                                                            </table>
-                                                        </td>
-                                                        % if not album_b:
-                                                        <td align="center" valign="top" class="card-instance pad"></td>
-                                                        % endif
-                                                        % endif
-                                                        % endfor
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    % endfor
-                                </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                                % if not album_b:
+                                                <td align="center" valign="top" class="card-instance pad"></td>
+                                                % endif
+                                                % endif
+                                                % endfor
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                % endfor
                            </table>
                        </td>
                    </tr>
                    % endif
                    <tr>
                        <td class="footer">
-                            <!-- START FOOTER -->
                            <div class="footer-bar"></div>
                            <div class="content-block powered-by">
                                Newsletter generated by <a href="http://tautulli.com" target="_blank">Tautulli</a>.
                            </div>
-                            <!-- END FOOTER -->
                        </td>
                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
                </table>
-
-                <!-- END CENTERED WHITE CONTAINER -->
            </div>
        </td>
    </tr>
--- a/lib/apscheduler/triggers/cron/expressions.py
+++ b/lib/apscheduler/triggers/cron/expressions.py
@@ -9,7 +9,7 @@ __all__ = ('AllExpression', 'RangeExpression', 'WeekdayRangeExpression',
           'WeekdayPositionExpression', 'LastDayOfMonthExpression')


-WEEKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
+WEEKDAYS = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
 MONTHS = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec']


--- a/plexpy/init.py
+++ b/plexpy/init.py
@@ -152,6 +152,17 @@ def initialize(config_file):
        logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR,
                          verbose=VERBOSE)

+        logger.info(u"Starting Tautulli {}".format(
+            common.RELEASE
+        ))
+        logger.info(u"{} {} ({}{})".format(
+            common.PLATFORM, common.PLATFORM_RELEASE, common.PLATFORM_VERSION,
+            ' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else ''
+        ))
+        logger.info(u"Python {}".format(
+            sys.version
+        ))
+
        if not CONFIG.BACKUP_DIR:
            CONFIG.BACKUP_DIR = os.path.join(DATA_DIR, 'backups')
        if not os.path.exists(CONFIG.BACKUP_DIR):
@@ -637,7 +648,7 @@ def dbcheck():
    # newsletters table :: This table keeps record of the newsletter settings
    c_db.execute(
        'CREATE TABLE IF NOT EXISTS newsletters (id INTEGER PRIMARY KEY AUTOINCREMENT, '
-        'agent_id INTEGER, agent_name TEXT, agent_label TEXT, '
+        'agent_id INTEGER, agent_name TEXT, agent_label TEXT, id_name TEXT NOT NULL DEFAULT "", '
        'friendly_name TEXT, newsletter_config TEXT, email_config TEXT, '
        'subject TEXT, body TEXT, message TEXT, '
        'cron TEXT NOT NULL DEFAULT "0 0 * * 0", active INTEGER DEFAULT 0)'
@@ -648,7 +659,7 @@ def dbcheck():
        'CREATE TABLE IF NOT EXISTS newsletter_log (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp INTEGER, '
        'newsletter_id INTEGER, agent_id INTEGER, agent_name TEXT, notify_action TEXT, '
        'subject_text TEXT, body_text TEXT, message_text TEXT, start_date TEXT, end_date TEXT, '
-        'start_time INTEGER, end_time INTEGER, uuid TEXT UNIQUE, success INTEGER DEFAULT 0)'
+        'start_time INTEGER, end_time INTEGER, uuid TEXT UNIQUE, filename TEXT, success INTEGER DEFAULT 0)'
    )

    # recently_added table :: This table keeps record of recently added items
@@ -1495,6 +1506,24 @@ def dbcheck():
            'ALTER TABLE newsletter_log ADD COLUMN end_time INTEGER'
        )

+    # Upgrade newsletter_log table from earlier versions
+    try:
+        c_db.execute('SELECT filename FROM newsletter_log')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table newsletter_log.")
+        c_db.execute(
+            'ALTER TABLE newsletter_log ADD COLUMN filename TEXT'
+        )
+
+    # Upgrade newsletters table from earlier versions
+    try:
+        c_db.execute('SELECT id_name FROM newsletters')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table newsletters.")
+        c_db.execute(
+            'ALTER TABLE newsletters ADD COLUMN id_name TEXT NOT NULL DEFAULT ""'
+        )
+
    # Upgrade library_sections table from earlier versions (remove UNIQUE constraint on section_id)
    try:
        result = c_db.execute('SELECT SQL FROM sqlite_master WHERE type="table" AND name="library_sections"').fetchone()
@@ -1694,9 +1723,9 @@ def dbcheck():
            for row in result:
                img_hash = notification_handler.set_hash_image_info(
                    rating_key=row['rating_key'], width=1000, height=1500, fallback='poster')
-                data_factory.set_imgur_info(img_hash=img_hash, imgur_title=row['poster_title'],
-                                            imgur_url=row['poster_url'], delete_hash=row['delete_hash'],
-                                            service='imgur')
+                data_factory.set_img_info(img_hash=img_hash, imgur_title=row['poster_title'],
+                                          imgur_url=row['poster_url'], delete_hash=row['delete_hash'],
+                                          service='imgur')

            db.action('DROP TABLE poster_urls')
    except sqlite3.OperationalError:
@@ -1794,7 +1823,8 @@ def initialize_tracker():
        'appVersion': common.RELEASE,
        'appId': plexpy.INSTALL_TYPE,
        'appInstallerId': plexpy.CONFIG.GIT_BRANCH,
-        'dimension1': '{} {}'.format(common.PLATFORM, common.PLATFORM_VERSION),  # App Platform
+        'dimension1': '{} {}'.format(common.PLATFORM, common.PLATFORM_RELEASE),  # App Platform
+        'dimension2': common.PLATFORM_LINUX_DISTRO,  # Linux Distro
        'userLanguage': plexpy.SYS_LANGUAGE,
        'documentEncoding': plexpy.SYS_ENCODING,
        'noninteractive': True
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -37,6 +37,8 @@ import logger
 import mobile_app
 import notification_handler
 import notifiers
+import newsletter_handler
+import newsletters
 import users


@@ -443,6 +445,51 @@ class API2:

        return

+    def notify_newsletter(self, newsletter_id='', subject='', body='', message='', **kwargs):
+        """ Send a newsletter using Tautulli.
+
+            ```
+            Required parameters:
+                newsletter_id (int):    The ID number of the newsletter agent
+
+            Optional parameters:
+                subject (str):          The subject of the newsletter
+                body (str):             The body of the newsletter
+                message (str):          The message of the newsletter
+
+            Returns:
+                None
+            ```
+        """
+        if not newsletter_id:
+            self._api_msg = 'Newsletter failed: no newsletter id provided.'
+            self._api_result_type = 'error'
+            return
+
+        newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
+
+        if not newsletter:
+            self._api_msg = 'Newsletter failed: invalid newsletter_id provided %s.' % newsletter_id
+            self._api_result_type = 'error'
+            return
+
+        logger.api_debug(u'Tautulli APIv2 :: Sending newsletter.')
+        success = newsletter_handler.notify(newsletter_id=newsletter_id,
+                                            notify_action='api',
+                                            subject=subject,
+                                            body=body,
+                                            message=message,
+                                            **kwargs)
+
+        if success:
+            self._api_msg = 'Newsletter sent.'
+            self._api_result_type = 'success'
+        else:
+            self._api_msg = 'Newsletter failed.'
+            self._api_result_type = 'error'
+
+        return
+
    def _api_make_md(self):
        """ Tries to make a API.md to simplify the api docs. """

--- a/plexpy/common.py
+++ b/plexpy/common.py
@@ -20,11 +20,13 @@ import version

 # Identify Our Application
 PLATFORM = platform.system()
-PLATFORM_VERSION = platform.release()
+PLATFORM_RELEASE = platform.release()
+PLATFORM_VERSION = platform.version()
+PLATFORM_LINUX_DISTRO = ' '.join(x for x in platform.linux_distribution() if x)
 BRANCH = version.PLEXPY_BRANCH
 RELEASE = version.PLEXPY_RELEASE_VERSION

-USER_AGENT = 'Tautulli/{} ({} {})'.format(RELEASE, PLATFORM, PLATFORM_VERSION)
+USER_AGENT = 'Tautulli/{} ({} {})'.format(RELEASE, PLATFORM, PLATFORM_RELEASE)

 DEFAULT_USER_THUMB = "interfaces/default/images/gravatar-default-80x80.png"
 DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png"
@@ -519,13 +521,16 @@ NEWSLETTER_PARAMETERS = [
        'category': 'Global',
        'parameters': [
            {'name': 'Server Name', 'type': 'str', 'value': 'server_name', 'description': 'The name of your Plex Server.'},
-            {'name': 'Start Date', 'type': 'str', 'value': 'start_date', 'description': 'The start date of the newesletter.'},
-            {'name': 'End Date', 'type': 'str', 'value': 'end_date', 'description': 'The end date of the newesletter.'},
+            {'name': 'Start Date', 'type': 'str', 'value': 'start_date', 'description': 'The start date of the newsletter.'},
+            {'name': 'End Date', 'type': 'str', 'value': 'end_date', 'description': 'The end date of the newsletter.'},
            {'name': 'Week Number', 'type': 'int', 'value': 'week_number', 'description': 'The week number of the year.'},
            {'name': 'Newsletter Time Frame', 'type': 'int', 'value': 'newsletter_time_frame', 'description': 'The time frame included in the newsletter.'},
            {'name': 'Newsletter Time Frame Units', 'type': 'str', 'value': 'newsletter_time_frame_units', 'description': 'The time frame units included in the newsletter.'},
            {'name': 'Newsletter URL', 'type': 'str', 'value': 'newsletter_url', 'description': 'The self-hosted URL to the newsletter.'},
+            {'name': 'Newsletter Static URL', 'type': 'str', 'value': 'newsletter_static_url', 'description': 'The static self-hosted URL to the latest scheduled newsletter for the agent.'},
            {'name': 'Newsletter UUID', 'type': 'str', 'value': 'newsletter_uuid', 'description': 'The unique identifier for the newsletter.'},
+            {'name': 'Newsletter ID', 'type': 'int', 'value': 'newsletter_id', 'description': 'The unique ID number for the newsletter agent.'},
+            {'name': 'Newsletter ID Name', 'type': 'int', 'value': 'newsletter_id_name', 'description': 'The unique ID name for the newsletter agent.'},
        ]
     },
    {
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -312,9 +312,12 @@ _CONFIG_DEFINITIONS = {
    'MONITOR_REMOTE_ACCESS': (int, 'Monitoring', 0),
    'MONITORING_INTERVAL': (int, 'Monitoring', 60),
    'MONITORING_USE_WEBSOCKET': (int, 'Monitoring', 0),
+    'NEWSLETTER_CUSTOM_DIR': (str, 'Newsletter', ''),
+    'NEWSLETTER_INLINE_STYLES': (int, 'Newsletter', 1),
    'NEWSLETTER_TEMPLATES': (str, 'Newsletter', 'newsletters'),
    'NEWSLETTER_DIR': (str, 'Newsletter', ''),
    'NEWSLETTER_SELF_HOSTED': (int, 'Newsletter', 0),
+    'NEWSLETTER_STATIC_URL': (int, 'Newsletter', 0),
    'NMA_APIKEY': (str, 'NMA', ''),
    'NMA_ENABLED': (int, 'NMA', 0),
    'NMA_PRIORITY': (int, 'NMA', 0),
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1215,52 +1215,64 @@ class DataFactory(object):

        monitor_db.upsert(table, key_dict=keys, value_dict=values)

-    def delete_img_info(self, rating_key=None, service=None):
+    def delete_img_info(self, rating_key=None, service='', delete_all=False):
        monitor_db = database.MonitorDatabase()

-        if rating_key:
-            service = service or helpers.get_img_service()
+        if not delete_all:
+            service = helpers.get_img_service()

-            if service == 'imgur':
-                # Delete from Imgur
-                query = 'SELECT imgur_title, delete_hash, fallback FROM imgur_lookup ' \
-                        'JOIN image_hash_lookup ON imgur_lookup.img_hash = image_hash_lookup.img_hash ' \
-                        'WHERE rating_key = ? '
-                args = [rating_key]
-                results = monitor_db.select(query, args=args)
-
-                for imgur_info in results:
-                    if imgur_info['delete_hash']:
-                        helpers.delete_from_imgur(delete_hash=imgur_info['delete_hash'],
-                                                  img_title=imgur_info['imgur_title'],
-                                                  fallback=imgur_info['fallback'])
-
-                logger.info(u"Tautulli DataFactory :: Deleting Imgur info for rating_key %s from the database."
-                            % rating_key)
-                result = monitor_db.action('DELETE FROM imgur_lookup WHERE img_hash '
-                                           'IN (SELECT img_hash FROM image_hash_lookup WHERE rating_key = ?)',
-                                           [rating_key])
-
-            elif service == 'cloudinary':
-                # Delete from Cloudinary
-                helpers.delete_from_cloudinary(rating_key=rating_key)
-
-                logger.info(u"Tautulli DataFactory :: Deleting Cloudinary info for rating_key %s from the database."
-                            % rating_key)
-                result = monitor_db.action('DELETE FROM cloudinary_lookup WHERE img_hash '
-                                           'IN (SELECT img_hash FROM image_hash_lookup WHERE rating_key = ?)',
-                                           [rating_key])
-
-            else:
-                logger.error(u"Tautulli DataFactory :: Unable to delete hosted images: invalid service '%s' provided."
-                             % service)
-
-            return service
-
-        else:
+        if not rating_key and not delete_all:
            logger.error(u"Tautulli DataFactory :: Unable to delete hosted images: rating_key not provided.")
            return False

+        where = ''
+        args = []
+        log_msg = ''
+        if rating_key:
+            where = 'WHERE rating_key = ?'
+            args = [rating_key]
+            log_msg = ' for rating_key %s' % rating_key
+
+        if service.lower() == 'imgur':
+            # Delete from Imgur
+            query = 'SELECT imgur_title, delete_hash, fallback FROM imgur_lookup ' \
+                    'JOIN image_hash_lookup ON imgur_lookup.img_hash = image_hash_lookup.img_hash %s' % where
+            results = monitor_db.select(query, args=args)
+
+            for imgur_info in results:
+                if imgur_info['delete_hash']:
+                    helpers.delete_from_imgur(delete_hash=imgur_info['delete_hash'],
+                                              img_title=imgur_info['imgur_title'],
+                                              fallback=imgur_info['fallback'])
+
+            logger.info(u"Tautulli DataFactory :: Deleting Imgur info%s from the database."
+                        % log_msg)
+            result = monitor_db.action('DELETE FROM imgur_lookup WHERE img_hash '
+                                       'IN (SELECT img_hash FROM image_hash_lookup %s)' % where,
+                                       args)
+
+        elif service.lower() == 'cloudinary':
+            # Delete from Cloudinary
+            query = 'SELECT cloudinary_title, rating_key, fallback FROM cloudinary_lookup ' \
+                    'JOIN image_hash_lookup ON cloudinary_lookup.img_hash = image_hash_lookup.img_hash %s ' \
+                    'GROUP BY rating_key' % where
+            results = monitor_db.select(query, args=args)
+
+            for cloudinary_info in results:
+                helpers.delete_from_cloudinary(rating_key=cloudinary_info['rating_key'])
+
+            logger.info(u"Tautulli DataFactory :: Deleting Cloudinary info%s from the database."
+                        % log_msg)
+            result = monitor_db.action('DELETE FROM cloudinary_lookup WHERE img_hash '
+                                       'IN (SELECT img_hash FROM image_hash_lookup %s)' % where,
+                                       args)
+
+        else:
+            logger.error(u"Tautulli DataFactory :: Unable to delete hosted images: invalid service '%s' provided."
+                         % service)
+
+        return service
+
    def get_poster_info(self, rating_key='', metadata=None, service=None):
        poster_key = ''
        if str(rating_key).isdigit():
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -792,8 +792,8 @@ def upload_to_cloudinary(img_data, img_title='', rating_key='', fallback=''):
    try:
        response = upload('data:image/png;base64,{}'.format(base64.b64encode(img_data)),
                          public_id='{}_{}'.format(fallback, rating_key),
-                          tags=[fallback, rating_key],
-                          context={'title': img_title, 'rating_key': rating_key, 'fallback': fallback})
+                          tags=[fallback, str(rating_key)],
+                          context={'title': img_title.encode('utf-8'), 'rating_key': str(rating_key), 'fallback': fallback})
        logger.debug(u"Tautulli Helpers :: Image '{}' ({}) uploaded to Cloudinary.".format(img_title, fallback))
        img_url = response.get('url', '')
    except Exception as e:
@@ -834,13 +834,14 @@ def cloudinary_transform(rating_key=None, width=1000, height=1500, opacity=100,
        api_secret=plexpy.CONFIG.CLOUDINARY_API_SECRET
    )

-    img_options = {}
+    img_options = {'format': img_format,
+                   'version': int(time.time())}

    if width != 1000:
-        img_options['width'] = width
+        img_options['width'] = str(width)
        img_options['crop'] = 'fill'
    if height != 1500:
-        img_options['height'] = height
+        img_options['height'] = str(height)
        img_options['crop'] = 'fill'
    if opacity != 100:
        img_options['opacity'] = opacity
@@ -849,14 +850,11 @@ def cloudinary_transform(rating_key=None, width=1000, height=1500, opacity=100,
    if blur != 0:
        img_options['effect'] = 'blur:{}'.format(blur * 100)

-    if img_options:
-        img_options['format'] = img_format
-
-        try:
-            url, options = cloudinary_url('{}_{}'.format(fallback, rating_key), **img_options)
-            logger.debug(u"Tautulli Helpers :: Image '{}' ({}) transformed on Cloudinary.".format(img_title, fallback))
-        except Exception as e:
-            logger.error(u"Tautulli Helpers :: Unable to transform image '{}' ({}) on Cloudinary: {}".format(img_title, fallback, e))
+    try:
+        url, options = cloudinary_url('{}_{}'.format(fallback, rating_key), **img_options)
+        logger.debug(u"Tautulli Helpers :: Image '{}' ({}) transformed on Cloudinary.".format(img_title, fallback))
+    except Exception as e:
+        logger.error(u"Tautulli Helpers :: Unable to transform image '{}' ({}) on Cloudinary: {}".format(img_title, fallback, e))

    return url

@@ -1072,7 +1070,10 @@ def get_plexpy_url(hostname=None):
            s.connect(('<broadcast>', 0))
            hostname = s.getsockname()[0]
        except socket.error:
-            hostname = socket.gethostbyname(socket.gethostname())
+            try:
+                hostname = socket.gethostbyname(socket.gethostname())
+            except socket.gaierror:
+                pass

        if not hostname:
            hostname = 'localhost'
--- a/plexpy/http_handler.py
+++ b/plexpy/http_handler.py
@@ -43,7 +43,7 @@ class HTTPHandler(object):
                        'X-Plex-Product': 'Tautulli',
                        'X-Plex-Version': plexpy.common.RELEASE,
                        'X-Plex-Platform': plexpy.common.PLATFORM,
-                        'X-Plex-Platform-Version': plexpy.common.PLATFORM_VERSION,
+                        'X-Plex-Platform-Version': plexpy.common.PLATFORM_RELEASE,
                        'X-Plex-Client-Identifier': plexpy.CONFIG.PMS_UUID,
                        }

--- a/plexpy/newsletter_handler.py
+++ b/plexpy/newsletter_handler.py
@@ -86,7 +86,9 @@ def notify(newsletter_id=None, notify_action=None, **kwargs):
        body = newsletter_config['body']
        message = newsletter_config['message']

-    newsletter_agent = newsletters.get_agent_class(agent_id=newsletter_config['agent_id'],
+    newsletter_agent = newsletters.get_agent_class(newsletter_id=newsletter_id,
+                                                   newsletter_id_name=newsletter_config['id_name'],
+                                                   agent_id=newsletter_config['agent_id'],
                                                   config=newsletter_config['config'],
                                                   email_config=newsletter_config['email_config'],
                                                   subject=subject,
@@ -100,6 +102,7 @@ def notify(newsletter_id=None, notify_action=None, **kwargs):
                                         subject=newsletter_agent.subject_formatted,
                                         body=newsletter_agent.body_formatted,
                                         message=newsletter_agent.message_formatted,
+                                         filename=newsletter_agent.filename_formatted,
                                         start_date=newsletter_agent.start_date.format('YYYY-MM-DD'),
                                         end_date=newsletter_agent.end_date.format('YYYY-MM-DD'),
                                         start_time=newsletter_agent.start_time,
@@ -114,7 +117,7 @@ def notify(newsletter_id=None, notify_action=None, **kwargs):
        return True


-def set_notify_state(newsletter, notify_action, subject, body, message,
+def set_notify_state(newsletter, notify_action, subject, body, message, filename,
                     start_date, end_date, start_time, end_time, newsletter_uuid):

    if newsletter and notify_action:
@@ -133,7 +136,8 @@ def set_notify_state(newsletter, notify_action, subject, body, message,
                  'start_date': start_date,
                  'end_date': end_date,
                  'start_time': start_time,
-                  'end_time': end_time}
+                  'end_time': end_time,
+                  'filename': filename}

        db.upsert(table_name='newsletter_log', key_dict=keys, value_dict=values)
        return db.last_insert_id()
@@ -149,20 +153,29 @@ def set_notify_success(newsletter_log_id):
    db.upsert(table_name='newsletter_log', key_dict=keys, value_dict=values)


-def get_newsletter(newsletter_uuid):
+def get_newsletter(newsletter_uuid=None, newsletter_id_name=None):
    db = database.MonitorDatabase()
-    result = db.select_single('SELECT newsletter_id, start_date, end_date FROM newsletter_log '
-                              'WHERE uuid = ?', [newsletter_uuid])
+
+    if newsletter_uuid:
+        result = db.select_single('SELECT start_date, end_date, uuid, filename FROM newsletter_log '
+                                  'WHERE uuid = ?', [newsletter_uuid])
+    elif newsletter_id_name:
+        result = db.select_single('SELECT start_date, end_date, uuid, filename FROM newsletter_log '
+                                  'JOIN newsletters ON newsletters.id = newsletter_log.newsletter_id '
+                                  'WHERE id_name = ? AND notify_action != "test" '
+                                  'ORDER BY timestamp DESC LIMIT 1', [newsletter_id_name])
+    else:
+        result = None

    if result:
-        newsletter_id = result['newsletter_id']
+        newsletter_uuid = result['uuid']
        start_date = result['start_date']
        end_date = result['end_date']
+        newsletter_file = result['filename'] or 'newsletter_%s-%s_%s.html' % (start_date.replace('-', ''),
+                                                                              end_date.replace('-', ''),
+                                                                              newsletter_uuid)

-        newsletter_file = 'newsletter_%s-%s_%s.html' % (start_date.replace('-', ''),
-                                                        end_date.replace('-', ''),
-                                                        newsletter_uuid)
-        newsletter_folder = plexpy.CONFIG.NEWSLETTER_DIR
+        newsletter_folder = plexpy.CONFIG.NEWSLETTER_DIR or os.path.join(plexpy.DATA_DIR, 'newsletters')
        newsletter_file_fp = os.path.join(newsletter_folder, newsletter_file)

        if newsletter_file in os.listdir(newsletter_folder):
@@ -173,4 +186,4 @@ def get_newsletter(newsletter_uuid):
            except OSError as e:
                logger.error(u"Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e))
        else:
-            logger.warn(u"Tautulli NewsletterHandler :: Newsletter '%s' file is missing." % newsletter_uuid)
+            logger.warn(u"Tautulli NewsletterHandler :: Newsletter file '%s' is missing." % newsletter_file)
--- a/plexpy/newsletters.py
+++ b/plexpy/newsletters.py
@@ -63,12 +63,14 @@ def available_notification_actions():
    return actions


-def get_agent_class(agent_id=None, config=None, email_config=None, start_date=None, end_date=None,
-                    subject=None, body=None, message=None):
+def get_agent_class(newsletter_id=None, newsletter_id_name=None, agent_id=None, config=None, email_config=None,
+                    start_date=None, end_date=None, subject=None, body=None, message=None):
    if str(agent_id).isdigit():
        agent_id = int(agent_id)

-        kwargs = {'config': config,
+        kwargs = {'newsletter_id': newsletter_id,
+                  'newsletter_id_name': newsletter_id_name,
+                  'config': config,
                  'email_config': email_config,
                  'start_date': start_date,
                  'end_date': end_date,
@@ -138,7 +140,9 @@ def get_newsletter_config(newsletter_id=None):
        subject = result.pop('subject')
        body = result.pop('body')
        message = result.pop('message')
-        newsletter_agent = get_agent_class(agent_id=result['agent_id'], config=config, email_config=email_config,
+        newsletter_agent = get_agent_class(newsletter_id=newsletter_id, newsletter_id_name=result['id_name'],
+                                           agent_id=result['agent_id'],
+                                           config=config, email_config=email_config,
                                           subject=subject, body=body, message=message)
    except Exception as e:
        logger.error(u"Tautulli Newsletters :: Failed to get newsletter config options: %s." % e)
@@ -176,6 +180,7 @@ def add_newsletter_config(agent_id=None, **kwargs):
    values = {'agent_id': agent['id'],
              'agent_name': agent['name'],
              'agent_label': agent['label'],
+              'id_name': '',
              'friendly_name': '',
              'newsletter_config': json.dumps(agent_class.config),
              'email_config': json.dumps(agent_class.email_config),
@@ -223,13 +228,15 @@ def set_newsletter_config(newsletter_id=None, agent_id=None, **kwargs):
    body = kwargs.pop('body')
    message = kwargs.pop('message')

-    agent_class = get_agent_class(agent_id=agent['id'], config=newsletter_config, email_config=email_config,
+    agent_class = get_agent_class(agent_id=agent['id'],
+                                  config=newsletter_config, email_config=email_config,
                                  subject=subject, body=body, message=message)

    keys = {'id': newsletter_id}
    values = {'agent_id': agent['id'],
              'agent_name': agent['name'],
              'agent_label': agent['label'],
+              'id_name': kwargs.get('id_name', ''),
              'friendly_name': kwargs.get('friendly_name', ''),
              'newsletter_config': json.dumps(agent_class.config),
              'email_config': json.dumps(agent_class.email_config),
@@ -267,8 +274,14 @@ def send_newsletter(newsletter_id=None, subject=None, body=None, message=None, n


 def serve_template(templatename, **kwargs):
-    interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/')
-    template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.NEWSLETTER_TEMPLATES)
+    if plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR:
+        template_dir = plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR
+    else:
+        interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/')
+        template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.NEWSLETTER_TEMPLATES)
+
+        if not plexpy.CONFIG.NEWSLETTER_INLINE_STYLES:
+            templatename = templatename.replace('.html', '.internal.html')

    _hplookup = TemplateLookup(directories=[template_dir], default_filters=['unicode', 'h'])

@@ -299,22 +312,26 @@ class Newsletter(object):
                       'time_frame': 7,
                       'time_frame_units': 'days',
                       'formatted': 1,
-                       'notifier_id': 0}
+                       'notifier_id': 0,
+                       'filename': '',
+                       'save_only': 0}
    _DEFAULT_EMAIL_CONFIG = EMAIL().return_default_config()
    _DEFAULT_EMAIL_CONFIG['from_name'] = 'Tautulli Newsletter'
    _DEFAULT_EMAIL_CONFIG['notifier_id'] = 0
    _DEFAULT_SUBJECT = 'Tautulli Newsletter'
    _DEFAULT_BODY = 'View the newsletter here: {newsletter_url}'
    _DEFAULT_MESSAGE = ''
-    _TEMPLATE_MASTER = ''
+    _DEFAULT_FILENAME = 'newsletter_{newsletter_uuid}.html'
    _TEMPLATE = ''

-    def __init__(self, config=None, email_config=None, start_date=None, end_date=None,
-                 subject=None, body=None, message=None):
+    def __init__(self, newsletter_id=None, newsletter_id_name=None, config=None, email_config=None,
+                 start_date=None, end_date=None, subject=None, body=None, message=None):
        self.config = self.set_config(config=config, default=self._DEFAULT_CONFIG)
        self.email_config = self.set_config(config=email_config, default=self._DEFAULT_EMAIL_CONFIG)
        self.uuid = generate_newsletter_uuid()

+        self.newsletter_id = newsletter_id
+        self.newsletter_id_name = newsletter_id_name or ''
        self.start_date = None
        self.end_date = None

@@ -346,7 +363,13 @@ class Newsletter(object):
        self.subject = subject or self._DEFAULT_SUBJECT
        self.body = body or self._DEFAULT_BODY
        self.message = message or self._DEFAULT_MESSAGE
+        self.filename = self.config['filename'] or self._DEFAULT_FILENAME
+
+        if not self.filename.endswith('.html'):
+            self.filename += '.html'
+
        self.subject_formatted, self.body_formatted, self.message_formatted = self.build_text()
+        self.filename_formatted = self.build_filename()

        self.data = {}
        self.newsletter = None
@@ -391,19 +414,14 @@ class Newsletter(object):
                'parameters': self.parameters,
                'data': self.data}

-    def generate_newsletter(self, preview=False, master=False):
+    def generate_newsletter(self, preview=False):
        if preview:
            self.is_preview = True

-        if master:
-            template = self._TEMPLATE_MASTER
-        else:
-            template = self._TEMPLATE
-
        self.retrieve_data()

        return serve_template(
-            templatename=template,
+            templatename=self._TEMPLATE,
            uuid=self.uuid,
            subject=self.subject_formatted,
            body=self.body_formatted,
@@ -421,13 +439,15 @@ class Newsletter(object):
            return False

        self._save()
+
+        if self.config['save_only']:
+            return True
+
        return self._send()

    def _save(self):
-        newsletter_file = 'newsletter_%s-%s_%s.html' % (self.start_date.format('YYYYMMDD'),
-                                                        self.end_date.format('YYYYMMDD'),
-                                                        self.uuid)
-        newsletter_folder = plexpy.CONFIG.NEWSLETTER_DIR
+        newsletter_file = self.filename_formatted
+        newsletter_folder = plexpy.CONFIG.NEWSLETTER_DIR or os.path.join(plexpy.DATA_DIR, 'newsletters')
        newsletter_file_fp = os.path.join(newsletter_folder, newsletter_file)

        # In case the user has deleted it manually
@@ -439,26 +459,35 @@ class Newsletter(object):
                for line in self.newsletter.encode('utf-8').splitlines():
                    if '<!-- IGNORE SAVE -->' not in line:
                        n_file.write(line + '\r\n')
+                        #n_file.write(line.strip())

-            logger.info(u"Tautulli Newsletters :: %s newsletter saved to %s" % (self.NAME, newsletter_file))
+            logger.info(u"Tautulli Newsletters :: %s newsletter saved to '%s'" % (self.NAME, newsletter_file))
        except OSError as e:
-            logger.error(u"Tautulli Newsletters :: Failed to save %s newsletter to %s: %s"
+            logger.error(u"Tautulli Newsletters :: Failed to save %s newsletter to '%s': %s"
                         % (self.NAME, newsletter_file, e))

    def _send(self):
        if self.config['formatted']:
+            newsletter_stripped = ''.join(l.strip() for l in self.newsletter.splitlines())
+
+            plaintext = 'HTML email support is required to view the newsletter.\n'
+            if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
+                plaintext += self._DEFAULT_BODY.format(**self.parameters)
+
            if self.email_config['notifier_id']:
                return send_notification(
                    notifier_id=self.email_config['notifier_id'],
                    subject=self.subject_formatted,
-                    body=self.newsletter
+                    body=newsletter_stripped,
+                    plaintext=plaintext
                )

            else:
                email = EMAIL(config=self.email_config)
                return email.notify(
                    subject=self.subject_formatted,
-                    body=self.newsletter
+                    body=newsletter_stripped,
+                    plaintext=plaintext
                )
        elif self.config['notifier_id']:
            return send_notification(
@@ -475,7 +504,10 @@ class Newsletter(object):
    def _build_params(self):
        date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT)

-        base_url = plexpy.CONFIG.HTTP_BASE_URL or helpers.get_plexpy_url()
+        if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
+            base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
+        else:
+            base_url = helpers.get_plexpy_url() + '/newsletter/'

        parameters = {
            'server_name': plexpy.CONFIG.PMS_NAME,
@@ -484,8 +516,11 @@ class Newsletter(object):
            'week_number': self.start_date.isocalendar()[1],
            'newsletter_time_frame': self.config['time_frame'],
            'newsletter_time_frame_units': self.config['time_frame_units'],
-            'newsletter_url': base_url.rstrip('/') + plexpy.HTTP_ROOT + 'newsletter/' + self.uuid,
-            'newsletter_uuid': self.uuid
+            'newsletter_url': base_url + self.uuid,
+            'newsletter_static_url': base_url + 'id/' + self.newsletter_id_name,
+            'newsletter_uuid': self.uuid,
+            'newsletter_id': self.newsletter_id,
+            'newsletter_id_name': self.newsletter_id_name
        }

        return parameters
@@ -529,6 +564,23 @@ class Newsletter(object):

        return subject, body, message

+    def build_filename(self):
+        from notification_handler import CustomFormatter
+        custom_formatter = CustomFormatter()
+
+        try:
+            filename = custom_formatter.format(unicode(self.filename), **self.parameters)
+        except LookupError as e:
+            logger.error(
+                u"Tautulli Newsletter :: Unable to parse parameter %s in newsletter filename. Using fallback." % e)
+            filename = unicode(self._DEFAULT_FILENAME).format(**self.parameters)
+        except Exception as e:
+            logger.error(
+                u"Tautulli Newsletter :: Unable to parse custom newsletter subject: %s. Using fallback." % e)
+            filename = unicode(self._DEFAULT_FILENAME).format(**self.parameters)
+
+        return filename
+
    def return_config_options(self):
        return self._return_config_options()

@@ -554,7 +606,6 @@ class RecentlyAdded(Newsletter):
    _DEFAULT_SUBJECT = 'Recently Added to {server_name}! ({end_date})'
    _DEFAULT_BODY = 'View the newsletter here: {newsletter_url}'
    _DEFAULT_MESSAGE = ''
-    _TEMPLATE_MASTER = 'recently_added_master.html'
    _TEMPLATE = 'recently_added.html'

    def _get_recently_added(self, media_type=None):
@@ -692,7 +743,7 @@ class RecentlyAdded(Newsletter):
        artists = recently_added.get('artist', [])
        albums = [a for artist in artists for a in artist['album']]

-        if self.is_preview or plexpy.CONFIG.NEWSLETTER_SELF_HOSTED:
+        if self.is_preview or helpers.get_img_service(include_self=True) == 'self-hosted':
            for item in movies + shows + albums:
                if item['media_type'] == 'album':
                    height = 150
@@ -714,7 +765,7 @@ class RecentlyAdded(Newsletter):
                item['poster_url'] = ''
                item['art_url'] = ''

-        else:
+        elif helpers.get_img_service():
            # Upload posters and art to image hosting service
            for item in movies + shows + albums:
                if item['media_type'] == 'album':
@@ -797,4 +848,4 @@ class RecentlyAdded(Newsletter):
             }
        ]

-        return config_options + additional_config
+        return additional_config + config_options
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -256,7 +256,7 @@ def notify_custom_conditions(notifier_id=None, parameters=None):

                elif parameter_type == 'float':
                    values = [helpers.cast_to_float(v) for v in values]
-            
+
            except ValueError as e:
                logger.error(u"Tautulli NotificationHandler :: Unable to cast condition '%s', values '%s', to type '%s'."
                             % (parameter, values, parameter_type))
@@ -317,7 +317,9 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
        else:
            evaluated_logic = all(evaluated_conditions[1:])

-        logger.debug(u"Tautulli NotificationHandler :: Custom condition evaluated to '%s'." % str(evaluated_logic))
+        logger.debug(u"Tautulli NotificationHandler :: Custom condition evaluated to '{}'. Conditions: {}.".format(
+            evaluated_logic, evaluated_conditions[1:]))
+
        return evaluated_logic

    return True
@@ -1096,7 +1098,10 @@ def get_img_info(img=None, rating_key=None, title='', width=1000, height=1500,

    service = helpers.get_img_service()

-    if service == 'cloudinary':
+    if service is None:
+        return img_info
+
+    elif service == 'cloudinary':
        if fallback == 'cover':
            w, h = 1000, 1000
        elif fallback == 'art':
@@ -1132,7 +1137,7 @@ def get_img_info(img=None, rating_key=None, title='', width=1000, height=1500,

    elif not database_img_info and img:
        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_image(**image_info)
+        result = pms_connect.get_image(refresh=True, **image_info)

        if result and result[0]:
            img_url = delete_hash = ''
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -1295,11 +1295,19 @@ class EMAIL(Notifier):

    def agent_notify(self, subject='', body='', action='', **kwargs):
        if self.config['html_support']:
+            plain = MIMEText(None, 'plain', 'utf-8')
+            plain.replace_header('Content-Transfer-Encoding', 'quoted-printable')
+            plain.set_payload(kwargs.get('plaintext', bleach.clean(body, strip=True)), 'utf-8')
+
+            html = MIMEText(body, 'html', 'utf-8')
+
            msg = MIMEMultipart('alternative')
-            msg.attach(MIMEText(bleach.clean(body, strip=True), 'plain', 'utf-8'))
-            msg.attach(MIMEText(body, 'html', 'utf-8'))
+            msg.attach(plain)
+            msg.attach(html)
        else:
-            msg = MIMEText(body, 'plain', 'utf-8')
+            msg = MIMEText(None, 'plain', 'utf-8')
+            msg.replace_header('Content-Transfer-Encoding', 'quoted-printable')
+            msg.set_payload(body, 'utf-8')

        msg['Message-ID'] = email.utils.make_msgid()
        msg['Date'] = email.utils.formatdate(localtime=True)
@@ -1310,26 +1318,30 @@ class EMAIL(Notifier):

        recipients = self.config['to'] + self.config['cc'] + self.config['bcc']

+        success = False
+        mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port'])
+
        try:
-            mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port'])
+            mailserver.ehlo()

            if self.config['tls']:
                mailserver.starttls()
-
-            mailserver.ehlo()
+                mailserver.ehlo()

            if self.config['smtp_user']:
                mailserver.login(str(self.config['smtp_user']), str(self.config['smtp_password']))

            mailserver.sendmail(self.config['from'], recipients, msg.as_string())
-            mailserver.quit()
-
-            logger.info(u"Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-            return True
+            success = True

        except Exception as e:
            logger.error(u"Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e))
-            return False
+
+        finally:
+            mailserver.quit()
+            logger.info(u"Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
+
+        return success

    def get_user_emails(self):
        emails = {u['email']: u['friendly_name'] for u in users.Users().get_users() if u['email']}
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -2436,7 +2436,7 @@ class PmsConnect(object):
        return labels_list

    def get_image(self, img=None, width=1000, height=1500, opacity=None, background=None, blur=None,
-                  img_format='png', clip=False, **kwargs):
+                  img_format='png', clip=False, refresh=False, **kwargs):
        """
        Return image data as array.
        Array contains the image content type and image binary
@@ -2454,6 +2454,9 @@ class PmsConnect(object):
        height = height or 1500

        if img:
+            if refresh:
+                img = '{}/{}'.format(img.rstrip('/'), int(time.time()))
+
            if clip:
                params = {'url': '%s&%s' % (img, urllib.urlencode({'X-Plex-Token': self.token}))}
            else:
@@ -2544,7 +2547,7 @@ class PmsConnect(object):
                        metadata = self.get_metadata_details(rating_key=rating_key)
                        search_results_list[metadata['media_type']].append(metadata)

-        output = {'results_count': sum(len(s) for s in search_results_list.items()),
+        output = {'results_count': sum(len(s) for s in search_results_list.values()),
                  'results_list': search_results_list
                  }

--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.1.2-beta"
+PLEXPY_RELEASE_VERSION = "v2.1.7-beta"
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1715,6 +1715,76 @@ class WebInterface(object):

        return serve_template(templatename="stream_data.html", title="Stream Data", data=stream_data, user=user)

+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    @requireAuth()
+    @addtoapi('get_stream_data')
+    def get_stream_data_api(self, row_id=None, session_key=None, **kwargs):
+        """ Get the stream details from history or current stream.
+
+            ```
+            Required parameters:
+                row_id (int):       The row ID number for the history item, OR
+                session_key (int):  The session key of the current stream
+
+            Optional parameters:
+                None
+
+            Returns:
+                json:
+                    {"aspect_ratio": "2.35",
+                     "audio_bitrate": 231,
+                     "audio_channels": 6,
+                     "audio_codec": "aac",
+                     "audio_decision": "transcode",
+                     "bitrate": 2731,
+                     "container": "mp4",
+                     "current_session": "",
+                     "grandparent_title": "",
+                     "media_type": "movie",
+                     "optimized_version": "",
+                     "optimized_version_profile": "",
+                     "optimized_version_title": "",
+                     "pre_tautulli": "",
+                     "quality_profile": "1.5 Mbps 480p",
+                     "stream_audio_bitrate": 203,
+                     "stream_audio_channels": 2,
+                     "stream_audio_codec": "aac",
+                     "stream_audio_decision": "transcode",
+                     "stream_bitrate": 730,
+                     "stream_container": "mkv",
+                     "stream_container_decision": "transcode",
+                     "stream_subtitle_codec": "",
+                     "stream_subtitle_decision": "",
+                     "stream_video_bitrate": 527,
+                     "stream_video_codec": "h264",
+                     "stream_video_decision": "transcode",
+                     "stream_video_framerate": "24p",
+                     "stream_video_height": 306,
+                     "stream_video_resolution": "SD",
+                     "stream_video_width": 720,
+                     "subtitle_codec": "",
+                     "subtitles": "",
+                     "synced_version": "",
+                     "synced_version_profile": "",
+                     "title": "Frozen",
+                     "transcode_hw_decoding": "",
+                     "transcode_hw_encoding": "",
+                     "video_bitrate": 2500,
+                     "video_codec": "h264",
+                     "video_decision": "transcode",
+                     "video_framerate": "24p",
+                     "video_height": 816,
+                     "video_resolution": "1080",
+                     "video_width": 1920
+                     }
+            ```
+        """
+        data_factory = datafactory.DataFactory()
+        stream_data = data_factory.get_stream_details(row_id, session_key)
+
+        return stream_data
+
    @cherrypy.expose
    @requireAuth()
    def get_ip_address_details(self, ip_address=None, **kwargs):
@@ -2755,7 +2825,9 @@ class WebInterface(object):
            "tvmaze_lookup": checked(plexpy.CONFIG.TVMAZE_LOOKUP),
            "show_advanced_settings": plexpy.CONFIG.SHOW_ADVANCED_SETTINGS,
            "newsletter_dir": plexpy.CONFIG.NEWSLETTER_DIR,
-            "newsletter_self_hosted": checked(plexpy.CONFIG.NEWSLETTER_SELF_HOSTED)
+            "newsletter_self_hosted": checked(plexpy.CONFIG.NEWSLETTER_SELF_HOSTED),
+            "newsletter_inline_styles": checked(plexpy.CONFIG.NEWSLETTER_INLINE_STYLES),
+            "newsletter_custom_dir": plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR
        }

        return serve_template(templatename="settings.html", title="Settings", config=config, kwargs=kwargs)
@@ -2777,7 +2849,7 @@ class WebInterface(object):
            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
            "history_table_activity", "plexpy_auto_update",
            "themoviedb_lookup", "tvmaze_lookup", "http_plex_admin",
-            "newsletter_self_hosted"
+            "newsletter_self_hosted", "newsletter_inline_styles"
        ]
        for checked_config in checked_configs:
            if checked_config not in kwargs:
@@ -3962,13 +4034,20 @@ class WebInterface(object):
            return

        if rating_key and not img:
-            img = '/library/metadata/%s/thumb/1337' % rating_key
+            if fallback == 'art':
+                img = '/library/metadata/{}/art'.format(rating_key)
+            else:
+                img = '/library/metadata/{}/thumb'.format(rating_key)

-        img_string = img.rsplit('/', 1)[0] if '/library/metadata' in img else img
-        img_string = '{}{}{}{}{}{}'.format(img_string, width, height, opacity, background, blur)
+        img_split = img.split('/')
+        img = '/'.join(img_split[:5])
+        rating_key = rating_key or img_split[3]

-        fp = hashlib.md5(img_string).hexdigest()
-        fp += '.%s' % img_format  # we want to be able to preview the thumbs
+        img_string = '{}.{}.{}.{}.{}.{}.{}.{}'.format(
+            plexpy.CONFIG.PMS_UUID, img, rating_key, width, height, opacity, background, blur, fallback)
+        img_hash = hashlib.sha256(img_string).hexdigest()
+
+        fp = '{}.{}'.format(img_hash, img_format)  # we want to be able to preview the thumbs
        c_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, 'images')
        ffp = os.path.join(c_dir, fp)

@@ -3994,7 +4073,8 @@ class WebInterface(object):
                                               background=background,
                                               blur=blur,
                                               img_format=img_format,
-                                               clip=clip)
+                                               clip=clip,
+                                               refresh=refresh)

                if result and result[0]:
                    cherrypy.response.headers['Content-type'] = result[1]
@@ -4023,6 +4103,15 @@ class WebInterface(object):
    @cherrypy.expose
    def image(self, *args, **kwargs):
        if args:
+            cherrypy.response.headers['Cache-Control'] = 'max-age=3600'  # 1 hour
+
+            if len(args) >= 2 and args[0] == 'images':
+                resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/')
+                try:
+                    return serve_file(path=os.path.join(resource_dir, *args), content_type='image/png')
+                except NotFound:
+                    return
+
            img_hash = args[0].split('.')[0]

            if img_hash in ('poster', 'cover', 'art'):
@@ -4040,7 +4129,7 @@ class WebInterface(object):

            if img_info:
                kwargs.update(img_info)
-                return self.real_pms_image_proxy(**kwargs)
+                return self.real_pms_image_proxy(refresh=True, **kwargs)

        return

@@ -4161,16 +4250,18 @@ class WebInterface(object):
    @cherrypy.tools.json_out()
    @requireAuth(member_of("admin"))
    @addtoapi()
-    def delete_hosted_images(self, rating_key='', service='', **kwargs):
+    def delete_hosted_images(self, rating_key='', service='', delete_all=False, **kwargs):
        """ Delete the images uploaded to image hosting services.

            ```
            Required parameters:
+                None
+
+            Optional parameters:
                rating_key (int):       1234
                                        (Note: Must be the movie, show, season, artist, or album rating key)
-            Optional parameters:
-                service (str):          imgur or cloudinary
-                                        (Note: Defaults to service in Image Hosting setting)
+                service (str):          'imgur' or 'cloudinary'
+                delete_all (bool):      'true' to delete all images form the service

            Returns:
                json:
@@ -4179,8 +4270,10 @@ class WebInterface(object):
            ```
        """

+        delete_all = (delete_all == 'true')
+
        data_factory = datafactory.DataFactory()
-        result = data_factory.delete_img_info(rating_key=rating_key, service=service)
+        result = data_factory.delete_img_info(rating_key=rating_key, service=service, delete_all=delete_all)

        if result:
            return {'result': 'success', 'message': 'Deleted hosted images from %s.' % result.capitalize()}
@@ -5459,7 +5552,7 @@ class WebInterface(object):
            Returns:
                json:
                    [{"id": 1,
-                      "agent_id": 13,
+                      "agent_id": 0,
                      "agent_name": "recently_added",
                      "agent_label": "Recently Added",
                      "friendly_name": "",
@@ -5519,15 +5612,24 @@ class WebInterface(object):
            Returns:
                json:
                    {"id": 1,
-                     "agent_id": 13,
+                     "agent_id": 0,
                     "agent_name": "recently_added",
                     "agent_label": "Recently Added",
                     "friendly_name": "",
+                     "id_name": "",
                     "cron": "0 0 * * 1",
-                     "active": 1
-                     "config": {"time_frame": 7,
-                                "time_frame_units": "days",
-                                "incl_libraries": [1, 2]
+                     "active": 1,
+                     "subject": "Recently Added to {server_name}! ({end_date})",
+                     "body": "View the newsletter here: {newsletter_url}",
+                     "message": "",
+                     "config": {"custom_cron": 0,
+                                "filename": "newsletter_{newsletter_uuid}.html",
+                                "formatted": 1,
+                                "incl_libraries": ["1", "2"],
+                                "notifier_id": 1,
+                                "save_only": 0,
+                                "time_frame": 7,
+                                "time_frame_units": "days"
                                },
                     "email_config": {...},
                     "config_options": [{...}, ...],
@@ -5574,19 +5676,15 @@ class WebInterface(object):
    @requireAuth(member_of("admin"))
    @addtoapi()
    def set_newsletter_config(self, newsletter_id=None, agent_id=None, **kwargs):
-        """ Configure an exisitng notificaiton agent.
+        """ Configure an exisitng newsletter agent.

            ```
            Required parameters:
-                newsletter_id (int):            The newsletter config to update
-                agent_id (int):       The newsletter type of the newsletter
+                newsletter_id (int):    The newsletter config to update
+                agent_id (int):         The newsletter type of the newsletter

            Optional parameters:
-                Pass all the config options for the agent with the agent prefix:
-                    e.g. For Recently Added: recently_added_last_days
-                                             recently_added_incl_movies
-                                             recently_added_incl_shows
-                                             recently_added_incl_artists
+                Pass all the config options for the agent with the 'newsletter_config_' and 'newsletter_email_' prefix.

            Returns:
                None
@@ -5604,7 +5702,6 @@ class WebInterface(object):
    @cherrypy.expose
    @cherrypy.tools.json_out()
    @requireAuth(member_of("admin"))
-    @addtoapi("notify_newsletter")
    def send_newsletter(self, newsletter_id=None, subject='', body='', message='', notify_action='', **kwargs):
        """ Send a newsletter using Tautulli.

@@ -5645,6 +5742,7 @@ class WebInterface(object):
    @cherrypy.expose
    def newsletter(self, *args, **kwargs):
        if args:
+            # Keep this for backwards compatibility for images through /newsletter/image
            if len(args) >= 2 and args[0] == 'image':
                if args[1] == 'images':
                    resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/')
@@ -5653,10 +5751,17 @@ class WebInterface(object):
                    except NotFound:
                        return

-                return self.image(args[1], refresh=True)
+                return self.image(args[1])

-            newsletter_uuid = args[0]
-            newsletter = newsletter_handler.get_newsletter(newsletter_uuid=newsletter_uuid)
+            if len(args) >= 2 and args[0] == 'id':
+                newsletter_id_name = args[1]
+                newsletter_uuid = None
+            else:
+                newsletter_id_name = None
+                newsletter_uuid = args[0]
+
+            newsletter = newsletter_handler.get_newsletter(newsletter_uuid=newsletter_uuid,
+                                                           newsletter_id_name=newsletter_id_name)
            return newsletter

    @cherrypy.expose
@@ -5670,12 +5775,14 @@ class WebInterface(object):
    @cherrypy.expose
    @requireAuth(member_of("admin"))
    def real_newsletter(self, newsletter_id=None, start_date=None, end_date=None,
-                        preview=False, master=False, raw=False, **kwargs):
+                        preview=False, raw=False, **kwargs):
        if newsletter_id and newsletter_id != 'None':
            newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)

            if newsletter:
-                newsletter_agent = newsletters.get_agent_class(agent_id=newsletter['agent_id'],
+                newsletter_agent = newsletters.get_agent_class(newsletter_id=newsletter_id,
+                                                               newsletter_id_name=newsletter['id_name'],
+                                                               agent_id=newsletter['agent_id'],
                                                               config=newsletter['config'],
                                                               start_date=start_date,
                                                               end_date=end_date,
@@ -5683,14 +5790,13 @@ class WebInterface(object):
                                                               body=newsletter['body'],
                                                               message=newsletter['message'])
                preview = (preview == 'true')
-                master = (master == 'true')
                raw = (raw == 'true')

                if raw:
                    cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
                    return json.dumps(newsletter_agent.raw_data(preview=preview))

-                return newsletter_agent.generate_newsletter(preview=preview, master=master)
+                return newsletter_agent.generate_newsletter(preview=preview)

            logger.error(u"Failed to retrieve newsletter: Invalid newsletter_id %s" % newsletter_id)
            return "Failed to retrieve newsletter: invalid newsletter_id parameter"
Author	SHA1	Message	Date
JonnyWong16	908dbc3243	v2.1.7-beta	2018-05-13 12:10:12 -07:00
JonnyWong16	14b6df8c25	Add newsletter commands to API docs	2018-05-13 11:46:58 -07:00
JonnyWong16	d3e53cb97f	Add button to delete all Imgur/Cloudinary uploads	2018-05-13 11:29:59 -07:00
JonnyWong16	445eea5c1e	Add plaintext message to newsletter email	2018-05-12 12:16:33 -07:00
JonnyWong16	c5918d7d6c	Add option to use inline css styles	2018-05-11 21:43:26 -07:00
JonnyWong16	b8e025193e	Add max-width to newsletter card titles	2018-05-11 21:23:19 -07:00
JonnyWong16	85772cdd83	Strip whitespace before sending newsletters	2018-05-11 19:18:05 -07:00
JonnyWong16	7f2bab3082	Switch to header styles for newsletter template	2018-05-11 18:27:31 -07:00
JonnyWong16	8185cc1c40	Keep /newsletter/image proxy for backwards compatibility	2018-05-11 09:40:47 -07:00
JonnyWong16	63bfe96124	Add get_stream_data to API	2018-05-11 08:08:26 -07:00
JonnyWong16	88b640f5e2	Self-hosted newsletter images to use /image endpoint instead of proxying through newsletter	2018-05-10 20:28:42 -07:00
JonnyWong16	26b2342956	Fix typo	2018-05-10 12:04:52 -07:00
JonnyWong16	883280be09	Add Linux distro to Google Analytics	2018-05-10 08:52:28 -07:00
JonnyWong16	7c76b0678a	Log platform info on startup	2018-05-10 08:47:54 -07:00
JonnyWong16	e91ba46265	v2.1.6-beta	2018-05-09 20:26:06 -07:00
JonnyWong16	62104c95e3	Move newsletter filename setting and rename config tab	2018-05-08 19:39:27 -07:00
JonnyWong16	178bd89e7c	Better init config checkboxes JS	2018-05-08 17:40:17 -07:00
JonnyWong16	365260401c	Hide newsletter agent options when save only checked	2018-05-08 17:25:25 -07:00
JonnyWong16	04029bd4d3	Fix NoneType error in newsletter ID name for parameters	2018-05-08 12:56:12 -07:00
JonnyWong16	9cf1128712	Update newsletter preview note for image hosting	2018-05-08 11:22:16 -07:00
JonnyWong16	2eebce9f6c	Add HTTP root to newsletter ID name note	2018-05-08 11:01:20 -07:00
JonnyWong16	b08e071b81	Note newesletter ID name and filename as optional	2018-05-08 10:59:00 -07:00
JonnyWong16	7778d84728	Add setting to specify newsletter ID name for static URLs	2018-05-08 10:54:07 -07:00
JonnyWong16	8e3fe7bfa2	v2.1.5-beta	2018-05-07 21:22:46 -07:00
JonnyWong16	6f22c823be	Typo in static newsletter URL help text	2018-05-07 21:03:09 -07:00
JonnyWong16	34d7c67813	Merge pull request #1287 from RafaelSchridi/patch-3 Typo in Newsletter Parameters	2018-05-07 21:02:25 -07:00
JonnyWong16	862ed5ce9f	Add option to save newsletter only	2018-05-07 20:49:37 -07:00
JonnyWong16	84406e6797	Add setting to enable static newsletter URL	2018-05-07 20:39:04 -07:00
JonnyWong16	19cf567366	Add option to change the newsletter filename	2018-05-07 20:02:04 -07:00
JonnyWong16	8af697a157	Add URL to retrieve latest scheduled newsletter	2018-05-07 19:42:04 -07:00
JonnyWong16	76122bea5d	Fix Imgur URL database upgrade migration	2018-05-07 19:09:35 -07:00
JonnyWong16	1a12422908	Show local note on newsletter preview if image hosting enabled	2018-05-07 18:26:40 -07:00
JonnyWong16	2df9f0b48b	Add Cloudinary versioning when retrieving the image	2018-05-07 16:13:00 -07:00
JonnyWong16	8540b80e57	Refresh image when uploading to image hosting	2018-05-07 15:32:21 -07:00
JonnyWong16	8ad565a444	Add visible Plex server identifier in the settings	2018-05-07 09:13:16 -07:00
JonnyWong16	f91b6481b3	Close email SMTP connection cleanly if exception	2018-05-06 22:43:55 -07:00
JonnyWong16	826db082c9	Add setting for custom newsletter templates folder	2018-05-06 15:37:07 -07:00
Rafael Schridi	f3d64a7886	Typo in Newsletter Parameters	2018-05-06 23:05:36 +02:00
JonnyWong16	031d078bc2	Add Cache-Control header for newsletter images (Fixes Tautulli/Tautulli-Issues#71 )	2018-05-06 08:34:21 -07:00
JonnyWong16	04fcd78102	Uncoulpe self-hosted newsletter and image setting	2018-05-06 08:33:28 -07:00
JonnyWong16	53d1e0f541	Remove HTTP root from newsletter preview iframe	2018-05-05 23:40:44 -07:00
JonnyWong16	9719f0b25b	Update newsletter warning message	2018-05-05 22:59:10 -07:00
JonnyWong16	6d1d5bc822	Check for disabled image hosting	2018-05-05 13:06:20 -07:00
JonnyWong16	0d7bbe044d	Don't fetch recently added on homepage if Plex Cloud server is sleeping	2018-05-05 11:54:13 -07:00
JonnyWong16	b1dc5816a4	v2.1.4	2018-05-05 11:21:03 -07:00
JonnyWong16	476011a783	Fix newsletter URL with no HTTP root	2018-05-05 11:13:27 -07:00
JonnyWong16	e038c57c4c	v2.1.3-beta	2018-05-04 22:36:11 -07:00
JonnyWong16	a989a53750	Encode image title for Cloudinary upload	2018-05-04 16:11:42 -07:00
JonnyWong16	d8cfdea704	Log individual condition evalutation	2018-05-04 15:52:04 -07:00
JonnyWong16	ed4722c4ce	Improve refreshing of cached Plex images	2018-05-03 20:29:23 -07:00
JonnyWong16	17ab5f05ed	Patch apshceduler sun-sat as 0-6	2018-05-03 17:58:28 -07:00
JonnyWong16	71ab2248d7	Make sure Cloudinary parameters are strings	2018-05-03 08:34:32 -07:00
JonnyWong16	4fb4410552	Fix potential XSS in search	2018-05-02 10:26:05 -07:00
JonnyWong16	a915d2333f	Catch failed hostname resolution (Fixes Tautulli/Tautulli-Issues#68 )	2018-05-01 16:57:43 -07:00
JonnyWong16	aaf5a18251	Forgot missing '/'	2018-05-01 15:51:23 -07:00
JonnyWong16	b90026801b	Fix double HTTP root in newsletter URL	2018-05-01 15:37:37 -07:00