diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 9796f02e2..52f4889e7 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1102,6 +1102,17 @@
     "message": "General",
     "description": "Header for general options on the settings screen"
   },
+  "sendLinkPreviews": {
+    "message": "Send Link Previews",
+    "description":
+      "Option to control creation and send of link previews in setting screen"
+  },
+  "linkPreviewsDescription": {
+    "message":
+      "Enable local link previews (Restart for changes to take effect)",
+    "description":
+      "Additional detail provided for Link Previews option in settings screen"
+  },
   "spellCheckDescription": {
     "message": "Enable spell check of text entered in message composition box",
     "description": "Description of the media permission description"
diff --git a/js/background.js b/js/background.js
index 6623f98ae..46c52f36a 100644
--- a/js/background.js
+++ b/js/background.js
@@ -254,6 +254,11 @@
       getReadReceiptSetting: () => storage.get('read-receipt-setting'),
       setReadReceiptSetting: value =>
         storage.put('read-receipt-setting', value),
+
+      getLinkPreviewSetting: () => storage.get('linkPreviews', false),
+      setLinkPreviewSetting: value =>
+        storage.put('linkPreviews', value),
+
       getNotificationSetting: () =>
         storage.get('notification-setting', 'message'),
       setNotificationSetting: value =>
diff --git a/js/settings_start.js b/js/settings_start.js
index f4ee85d24..607178f10 100644
--- a/js/settings_start.js
+++ b/js/settings_start.js
@@ -20,6 +20,7 @@ const getInitialData = async () => ({
 
   messageTTL: await window.getMessageTTL(),
   readReceiptSetting: await window.getReadReceiptSetting(),
+  linkPreviewSetting: await window.getLinkPreviewSetting(),
   notificationSetting: await window.getNotificationSetting(),
   audioNotification: await window.getAudioNotification(),
 
diff --git a/js/views/settings_view.js b/js/views/settings_view.js
index 629660fb8..87e93fbb6 100644
--- a/js/views/settings_view.js
+++ b/js/views/settings_view.js
@@ -155,6 +155,12 @@
         value: window.initialData.hideMenuBar,
         setFn: window.setHideMenuBar,
       });
+      new CheckboxView({
+        el: this.$('.link-preview-setting'),
+        name: 'link-preview-setting',
+        value: window.initialData.linkPreviewSetting,
+        setFn: window.setLinkPreviewSetting,
+      });
       new MediaPermissionsSettingView({
         el: this.$('.media-permissions'),
         value: window.initialData.mediaPermissions,
diff --git a/main.js b/main.js
index 16aaced00..7baf6c805 100644
--- a/main.js
+++ b/main.js
@@ -1091,6 +1091,9 @@ installSettingsSetter('notification-setting');
 installSettingsGetter('audio-notification');
 installSettingsSetter('audio-notification');
 
+installSettingsGetter('link-preview-setting');
+installSettingsSetter('link-preview-setting');
+
 installSettingsGetter('spell-check');
 installSettingsSetter('spell-check');
 
diff --git a/preload.js b/preload.js
index 14dd611bc..65a788d89 100644
--- a/preload.js
+++ b/preload.js
@@ -171,6 +171,9 @@ installSetter('notification-setting', 'setNotificationSetting');
 installGetter('audio-notification', 'getAudioNotification');
 installSetter('audio-notification', 'setAudioNotification');
 
+installGetter('link-preview-setting', 'getLinkPreviewSetting');
+installSetter('link-preview-setting', 'setLinkPreviewSetting');
+
 installGetter('spell-check', 'getSpellCheck');
 installSetter('spell-check', 'setSpellCheck');
 
diff --git a/settings.html b/settings.html
index e7e12e9ab..f7aef778d 100644
--- a/settings.html
+++ b/settings.html
@@ -98,6 +98,10 @@
         <input type='checkbox' name='spell-check-setting' id='spell-check-setting' />
         <label for='spell-check-setting'>{{ spellCheckDescription }}</label>
       </div>
+      <div class='link-preview-setting'>
+        <input type='checkbox' name='link-preview-setting' id='link-preview-setting' />
+        <label for='link-preview-setting'>{{ linkPreviewsDescription }}</label>
+      </div>
     <hr>
     <div class='permissions-setting'>
       <h3>{{ permissions }}</h3>
diff --git a/settings_preload.js b/settings_preload.js
index 69704d53e..8fdb3c1ee 100644
--- a/settings_preload.js
+++ b/settings_preload.js
@@ -52,6 +52,9 @@ window.setNotificationSetting = makeSetter('notification-setting');
 window.getAudioNotification = makeGetter('audio-notification');
 window.setAudioNotification = makeSetter('audio-notification');
 
+window.getLinkPreviewSetting = makeGetter('link-preview-setting');
+window.setLinkPreviewSetting = makeSetter('link-preview-setting');
+
 window.getMediaPermissions = makeGetter('media-permissions');
 window.setMediaPermissions = makeSetter('media-permissions');