diff --git a/src/common/jingle_rtp.py b/src/common/jingle_rtp.py
index e64c175c090cb8a7a983e24e2dd728e8295f014e..09159bfc6e4ba9bd8a52e8668dfb7f7b2f553d7c 100644
--- a/src/common/jingle_rtp.py
+++ b/src/common/jingle_rtp.py
@@ -252,17 +252,20 @@ class JingleAudio(JingleRTPContent):
 		self.p2psession.set_codec_preferences(codecs)
 
 		# the local parts
+		# TODO: Add queues?
 		try:
-			self.sink = gst.parse_bin_from_description(gajim.config.get('audio_output_device'), True)
+			src_bin = gst.parse_bin_from_description('%s ! audioconvert'
+				% gajim.config.get('audio_input_device'), True)
 		except:
 			self.session.connection.dispatch('ERROR', (_("Audio configuration error"),
-				_("Couldn't setup audio output. Check your audio configuration.")))
+				_("Couldn't setup audio input. Check your audio configuration.")))
 
 		try:
-			src_bin = gst.parse_bin_from_description(gajim.config.get('audio_input_device'), True)
+			self.sink = gst.parse_bin_from_description('audioconvert ! %s'
+				% gajim.config.get('audio_output_device'), True)
 		except:
 			self.session.connection.dispatch('ERROR', (_("Audio configuration error"),
-				_("Couldn't setup audio input. Check your audio configuration.")))
+				_("Couldn't setup audio output. Check your audio configuration.")))
 
 		self.mic_volume = src_bin.get_by_name('gajim_vol')
 		self.mic_volume.set_property('volume', 1)
@@ -291,24 +294,26 @@ class JingleVideo(JingleRTPContent):
 
 		# the local parts
 		try:
-			src_bin = gst.parse_bin_from_description(gajim.config.get('video_input_device'), True)
+			src_bin = gst.parse_bin_from_description('%s ! videoscale ! ffmpegcolorspace'
+				% gajim.config.get('video_input_device'), True)
 		except:
 			self.session.connection.dispatch('ERROR', (_("Video configuration error"),
 				_("Couldn't setup video input. Check your video configuration.")))
-		caps = gst.element_factory_make('capsfilter')
-		caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240'))
+		#caps = gst.element_factory_make('capsfilter')
+		#caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240'))
 
-		self.pipeline.add(src_bin, caps)
-		src_bin.link(caps)
+		self.pipeline.add(src_bin)#, caps)
+		#src_bin.link(caps)
 
 		try:
-			self.sink = gst.parse_bin_from_description(gajim.config.get('video_output_device'), True)
+			self.sink = gst.parse_bin_from_description('videoscale ! ffmpegcolorspace ! %s'
+				% gajim.config.get('video_output_device'), True)
 		except:
 			self.session.connection.dispatch('ERROR', (_("Video configuration error"),
 				_("Couldn't setup video output. Check your video configuration.")))
 		self.pipeline.add(self.sink)
 
-		caps.get_pad('src').link(self.p2psession.get_property('sink-pad'))
+		src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad'))
 		self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
 
 		# The following is needed for farsight to process ICE requests:
diff --git a/src/common/multimedia_helpers.py b/src/common/multimedia_helpers.py
index 59d8b635f69e4b4416ccb374c8a0c0627375f4ec..4a2a4fb2ec70ef1bd23d7413d71d8255b9f32364 100644
--- a/src/common/multimedia_helpers.py
+++ b/src/common/multimedia_helpers.py
@@ -78,11 +78,9 @@ class VideoInputManager(DeviceManager):
 		self.detect_element('videotestsrc', _('Video test'),
 			'%s is-live=true')
 		# Auto src
-		self.detect_element('autovideosrc', _('Autodetect'),
-			'%s ! videoscale ! ffmpegcolorspace')
+		self.detect_element('autovideosrc', _('Autodetect'))
 		# V4L2 src ; TODO: Figure out why it doesn't work
-		self.detect_element('v4l2src', _('V4L2: %s'),
-			'%s ! videoscale ! ffmpegcolorspace')
+		self.detect_element('v4l2src', _('V4L2: %s'))
 		# Funny things, just to test...
 		# self.devices['GOOM'] = 'audiotestsrc ! goom'
 		# self.devices['screen'] = 'ximagesrc'