diff --git a/src/Greenshot.Addon.Imgur/IImgurConfiguration.cs b/src/Greenshot.Addon.Imgur/IImgurConfiguration.cs
index 15d021fb3..66320b996 100644
--- a/src/Greenshot.Addon.Imgur/IImgurConfiguration.cs
+++ b/src/Greenshot.Addon.Imgur/IImgurConfiguration.cs
@@ -54,6 +54,10 @@ namespace Greenshot.Addon.Imgur
 		[Description("Use pagelink instead of direct link on the clipboard")]
 	    [DefaultValue(false)]
 		bool UsePageLink { get; set; }
+		
+		[Description("Add [img] BBCode tag to the link on the clipboard")]
+	    [DefaultValue(false)]
+		bool addImgBBCode { get; set; }
 
 		[Description("Use anonymous access to Imgur")]
 		[DefaultValue(true)]
diff --git a/src/Greenshot.Addon.Imgur/IImgurLanguage.cs b/src/Greenshot.Addon.Imgur/IImgurLanguage.cs
index f012f8be5..aa9839013 100644
--- a/src/Greenshot.Addon.Imgur/IImgurLanguage.cs
+++ b/src/Greenshot.Addon.Imgur/IImgurLanguage.cs
@@ -60,6 +60,8 @@ namespace Greenshot.Addon.Imgur
 		string UploadSuccess { get; }
 
 		string UsePageLink { get; }
+		
+		string addImgBBCode { get; }
 
 	    string AnonymousAccess { get; }
 
diff --git a/src/Greenshot.Addon.Imgur/ImgurDestination.cs b/src/Greenshot.Addon.Imgur/ImgurDestination.cs
index b5dec259d..390cd6c24 100644
--- a/src/Greenshot.Addon.Imgur/ImgurDestination.cs
+++ b/src/Greenshot.Addon.Imgur/ImgurDestination.cs
@@ -171,7 +171,13 @@ namespace Greenshot.Addon.Imgur
                         using (var clipboardAccessToken = ClipboardNative.Access())
                         {
                             clipboardAccessToken.ClearContents();
-                            clipboardAccessToken.SetAsUrl(uploadUrl.AbsoluteUri);
+							
+							// EDIT
+							if (_imgurConfiguration.addImgBBCode && !_imgurConfiguration.UsePageLink) {
+								clipboardAccessToken.SetAsUnicodeString("[img]" + uploadUrl.AbsoluteUri + "[/img]");
+                            } else {
+								clipboardAccessToken.SetAsUrl(uploadUrl.AbsoluteUri);
+							}
                         }
                     }
                     catch (Exception ex)
diff --git a/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml b/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
index a297fcd4b..1a9408b34 100644
--- a/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
+++ b/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
@@ -14,6 +14,7 @@
                 <ContentControl x:Name="FileConfigPartViewModel"/>
                 <CheckBox IsChecked="{Binding ImgurConfiguration.AnonymousAccess}" Content="{Binding ImgurLanguage.AnonymousAccess}"/>
                 <CheckBox IsChecked="{Binding ImgurConfiguration.UsePageLink}" Content="{Binding ImgurLanguage.UsePageLink}"/>
+				<CheckBox IsChecked="{Binding ImgurConfiguration.addImgBBCode}" Content="{Binding ImgurLanguage.addImgBBCode}"/>
                 <Button x:Name="ShowHistory" Content="{Binding ImgurLanguage.History}"/>
                 <Button Content="{Binding ImgurLanguage.ResetCredentialsButton}" x:Name="ResetCredentials" />
             </StackPanel>