diff --git a/build.xml b/build.xml
index 54c0d1066..4d55f76dd 100644
--- a/build.xml
+++ b/build.xml
@@ -45,7 +45,7 @@
-
+
-
+
@@ -926,10 +926,13 @@
bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
bundle-plugin-facebookaccregwizz,
bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
- bundle-contactsource,bundle-plugin-reconnect,
- bundle-plugin-securityconfig,bundle-plugin-advancedconfig,
- bundle-plugin-sip2sipaccregwizz,
- bundle-credentialsstorage,bundle-credentialsstorage-slick"/>
+ bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig,
+ bundle-plugin-advancedconfig,bundle-plugin-sip2sipaccregwizz,
+ bundle-credentialsstorage,bundle-credentialsstorage-slick,
+ bundle-youtube,bundle-dailymotion,bundle-smiley,bundle-vimeo,
+ bundle-vbox7,bundle-metacafe,bundle-flickr,bundle-hulu,
+ bundle-twitpic,bundle-directimage,bundle-bliptv,bundle-viddler,
+ bundle-plugin-chatconfig"/>
@@ -2375,4 +2378,154 @@ org.apache.http.util"/>
prefix="net/java/sip/communicator/plugin/advancedconfig"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 812cc24fa..ae1ecb728 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -132,8 +132,22 @@ felix.auto.start.67= \
reference:file:sc-bundles/generalconfig.jar \
reference:file:sc-bundles/dictaccregwizz.jar \
reference:file:sc-bundles/otr.jar \
+ reference:file:sc-bundles/facebookaccregwizz.jar \
reference:file:sc-bundles/advancedconfig.jar \
- reference:file:sc-bundles/facebookaccregwizz.jar
+ reference:file:sc-bundles/replacement-youtube.jar \
+ reference:file:sc-bundles/replacement-dailymotion.jar \
+ reference:file:sc-bundles/replacement-smiley.jar \
+ reference:file:sc-bundles/replacement-vimeo.jar \
+ reference:file:sc-bundles/replacement-vbox7.jar \
+ reference:file:sc-bundles/replacement-metacafe.jar \
+ reference:file:sc-bundles/replacement-flickr.jar \
+ reference:file:sc-bundles/replacement-hulu.jar \
+ reference:file:sc-bundles/replacement-twitpic.jar \
+ reference:file:sc-bundles/replacement-directimage.jar \
+ reference:file:sc-bundles/replacement-bliptv.jar \
+ reference:file:sc-bundles/replacement-viddler.jar \
+ reference:file:sc-bundles/chatconfig.jar
+
#level 68 is for profiler, don't use it or change the build.xml file accordingly
diff --git a/resources/images/images.properties b/resources/images/images.properties
index 9fce8e243..39e653c2c 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -481,4 +481,7 @@ impl.media.DESKTOP_STREAMING_ICON=resources/images/impl/media/desktopStreaming.p
plugin.globalproxy.PLUGIN_ICON=resources/images/plugin/globalproxyconfig/configureIcon.png
# Advanced config form icon
-plugin.advancedconfig.PLUGIN_ICON=resources/images/plugin/advancedconfig/configIcon.png
\ No newline at end of file
+plugin.advancedconfig.PLUGIN_ICON=resources/images/plugin/advancedconfig/configIcon.png
+
+# Chat config form icon
+plugin.chatconfig.PLUGIN_ICON=resources/images/plugin/chatconfig/chatIcon.png
\ No newline at end of file
diff --git a/resources/images/plugin/chatconfig/chatIcon.png b/resources/images/plugin/chatconfig/chatIcon.png
new file mode 100644
index 000000000..7b8db43df
Binary files /dev/null and b/resources/images/plugin/chatconfig/chatIcon.png differ
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 9690a88ba..f7985b4ee 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1048,3 +1048,23 @@ plugin.globalproxy.PROTOCOL_SUPPORT=
\
# plugin reconnect
plugin.reconnectplugin.CONNECTION_FAILED_MSG=Connection failed for the following account:\nUser name: {0}, Server name: {1}.\nPlease check your settings or contact your network administrator for more information.
plugin.reconnectplugin.NETWORK_DOWN=Network connectivity lost!
+
+
+#plugin chat config
+
+plugin.chatconfig.TITLE=Chat
+plugin.chatconfig.replacement.TITLE=Image/Video:
+plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Enable smiley replacement
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Enable Image/Video replacement
+plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Sources:
+plugin.chatconfig.replacement.sources.METACAFE=Metacafe
+plugin.chatconfig.replacement.sources.HULU=Hulu
+plugin.chatconfig.replacement.sources.DAILYMOTION=DailyMotion
+plugin.chatconfig.replacement.sources.DIRECTIMAGE=Direct Image Link
+plugin.chatconfig.replacement.sources.FLICKR=Flickr Images
+plugin.chatconfig.replacement.sources.TWITPIC=Twitpic
+plugin.chatconfig.replacement.sources.VBOX7=Vbox7
+plugin.chatconfig.replacement.sources.VIMEO=Vimeo
+plugin.chatconfig.replacement.sources.YOUTUBE=Youtube
+plugin.chatconfig.replacement.sources.BLIPTV=Blip.tv
+plugin.chatconfig.replacement.sources.VIDDLER=Viddler
diff --git a/src/net/java/sip/communicator/impl/gui/GuiActivator.java b/src/net/java/sip/communicator/impl/gui/GuiActivator.java
index 8e31dc0c3..488ae1196 100644
--- a/src/net/java/sip/communicator/impl/gui/GuiActivator.java
+++ b/src/net/java/sip/communicator/impl/gui/GuiActivator.java
@@ -25,6 +25,7 @@
import net.java.sip.communicator.service.neomedia.*;
import net.java.sip.communicator.service.notification.*;
import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.replacement.*;
import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.service.shutdown.*;
import net.java.sip.communicator.service.systray.*;
@@ -83,10 +84,13 @@ public class GuiActivator implements BundleActivator
private static final Map