diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25e4f90a..f067bd0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ## Release v1.2.0 (Beta)
 
 ### Improvements
+- Add **Allow insecure contents** option to render images with `http://`.
 
 #### OS X
 - Add the option to show the icon on menu bar
@@ -67,7 +68,6 @@ The `electron-mattermost` project is now the official desktop application for th
 ### Known issues
 
 #### All platforms
-- Images with `http://` do not render.
 - Basic Authentication is not working.
 - Some keyboard shortcuts are missing. (e.g. <kbd>Ctrl+W</kbd>, <kbd>Command+,</kbd>)
 - Basic authentication requires a command line.
diff --git a/docs/setup.md b/docs/setup.md
index 90da5165..44360c28 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -48,8 +48,12 @@ The Settings Page is available from the **File** menu under **Settings** (Click
    2. Enter **URL** for the team site location. For example: `https://example.com/teamname` then click **Add**.
 - **Delete a Team Site**:
    1. Delete a Team Site by clicking the "x" next to the URL of the team site you wish to delete.
-- **Hide Menu Bar**
-   1. Under **Options** enable this option to hide the menu bar by default. Press "Alt" to show the Menu Bar.
+- **Options**
+  - **Hide Menu Bar**
+    1. Under **Options** enable this option to hide the menu bar by default. Press "Alt" to show the Menu Bar.
+  - **Allow insecure contents**
+    1. Your team is hosted on `https://`, images with `http://` are not rendered by default.
+       This option allows such images to be rendered, but please be careful for security.
 
 ### Menu Bar